Skip to content

Add support for orangepi-plus2e v2 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajlennon wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Add support for orangepi-plus2e v2 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ff89c3c
.gitmodules: Add meta-sunxi-contrib submodule layer
ajlennon Mar 14, 2019
58e3fe0
layers/meta-resin-allwinner: Add dependency on meta-sunxi-contrib
ajlennon Mar 14, 2019
ac36135
layers/meta-resin-allwinner: Add config. for OrangePi-Plus2E image
ajlennon Mar 14, 2019
57f3fbb
layers/meta-resin-allwinner: Add connectivity config. for rtl8189fs-mod
ajlennon Mar 14, 2019
0cf30e1
layers/meta-resin-allwinner: Configure linux kernel for OrangePi-Plus2E
ajlennon Mar 14, 2019
bd020b0
layers/meta-resin-allwinner: Configure OrangePi-Plus2E internal storage
ajlennon Mar 14, 2019
76464ad
layers/meta-resin-allwinner: Add OrangePi-Plus2E machine configuration
ajlennon Mar 14, 2019
7cdd33a
layers/meta-resin-allwinner: Add OrangePi-Plus2E SVG image
ajlennon Mar 14, 2019
c74a8ef
layers/meta-resin-allwinner: Add OrangePi-Plus2E COFFEE file
ajlennon Mar 14, 2019
96eb0c2
xradio.bb: Add xradio driver
Mar 22, 2019
c5a3c29
xradio-firmware.bb: Add xradio firmware
Mar 22, 2019
2c89288
v2.27.0+rev5
balena-ci Mar 22, 2019
ec7808b
Merge branch 'master' into ajl/orangepi-plus2e
Mar 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "layers/meta-rust"]
path = layers/meta-rust
url = https://github.com/meta-rust/meta-rust.git
[submodule "layers/meta-sunxi-contrib"]

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This submodule is not correctly added. The build server fails when fetching:

Command "git config --get submodule.layers/meta-sunxi-contrib.url" returned status code 1
Could not perform submodule update

How did you add the submodule in this PR? What are the commands you used?

path = layers/meta-sunxi-contrib
url = https://github.com/geomatsi/meta-sunxi-contrib.git
9 changes: 9 additions & 0 deletions layers/meta-resin-allwinner/conf/machine/orangepi-plus2e.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#@TYPE: Machine
#@NAME: Orange Pi Plus 2e
#@DESCRIPTION: Machine configuration for the Orange Pi Plus2e, based on allwinner H3 CPU http://www.orangepi.org/

require conf/machine/include/sun8i.inc

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should define instead a machine override like in: https://github.com/balena-os/balena-allwinner/blob/master/layers/meta-resin-allwinner/conf/machine/bananapi-m1-plus.conf#L5


KERNEL_DEVICETREE = "sun8i-h3-orangepi-plus2e.dtb"
UBOOT_MACHINE = "orangepi_plus2e_defconfig"
PREFERRED_VERSION_linux-mainline = "4.17.3"
1 change: 1 addition & 0 deletions layers/meta-resin-allwinner/conf/samples/bblayers.conf.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ BBLAYERS ?= " \
${TOPDIR}/../layers/meta-openembedded/meta-networking \
${TOPDIR}/../layers/meta-openembedded/meta-python \
${TOPDIR}/../layers/meta-sunxi \
${TOPDIR}/../layers/meta-sunxi-contrib \
${TOPDIR}/../layers/meta-resin/meta-resin-common \
${TOPDIR}/../layers/meta-resin/meta-resin-sumo \
${TOPDIR}/../layers/meta-resin-allwinner \
Expand Down
18 changes: 18 additions & 0 deletions layers/meta-resin-allwinner/recipes-core/images/resin-image.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
#

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please redo the commit header.

For this commit, the header should be something like:

resin-image.inc:

So the header should always reference the file being changed, not the layer (layers/meta-resin-allwinner)
This change has to be done on all the commits

# Orange Pi Plus2e
#

IMAGE_FSTYPES_append_orangepi-plus2e = " resinos-img"

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed if your machine conf file uses the machine override.


# Customize resinos-img
RESIN_IMAGE_BOOTLOADER_orangepi-plus2e = "u-boot"

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed if your machine conf file uses the machine override.

RESIN_BOOT_PARTITION_FILES_orangepi-plus2e = " \
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
uImage-sun8i-h3-orangepi-plus2e.dtb:/dtb/sun8i-h3-orangepi-plus2e.dtb \
u-boot-sunxi-with-spl.bin: \
"
IMAGE_CMD_resinos-img_append_orangepi-plus2e () {

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed if your machine conf file uses the machine override.

# Orange Pi Plus2e needs uboot written at a specific location
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
}

#
# Orange Pi Plus2
#
Expand Down
1 change: 1 addition & 0 deletions .../meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CONNECTIVITY_FIRMWARES_append = " linux-firmware-ap6212 linux-firmware-brcm43362"
CONNECTIVITY_MODULES_append_orangepi-plus2 = " rtl8189"
CONNECTIVITY_MODULES_append_orangepi-plus2e = " rtl8189fs-mod"

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you rephrase the commit log? "Connectivity config." doesn't describe what that package really is


CONNECTIVITY_MODULES_append_orange-pi-zero = " xradio"
CONNECTIVITY_FIRMWARES_append_orange-pi-zero = " xradio-firmware"
Expand Down
3 changes: 3 additions & 0 deletions layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RESIN_CONFIGS[axp_power] ="\
"

RESIN_CONFIGS_append_orangepi-plus2 = " wifi"
RESIN_CONFIGS_append_orangepi-plus2e = " wifi"

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed if your machine conf file uses the machine override

RESIN_CONFIGS_append_orange-pi-zero = " wifi"
RESIN_CONFIGS[wifi] ="\
CONFIG_WIRELESS=y \
Expand All @@ -27,6 +28,7 @@ RESIN_CONFIGS[wifi] ="\
"

RESIN_CONFIGS_append_orangepi-plus2 = " pl2303"
RESIN_CONFIGS_append_orangepi-plus2e = " pl2303"

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed if your machine conf file uses the machine override

RESIN_CONFIGS_DEPS[pl2303] = "\
CONFIG_USB_SERIAL=m \
"
Expand All @@ -35,6 +37,7 @@ RESIN_CONFIGS[pl2303] ="\
"

RESIN_CONFIGS_append_orangepi-plus2 = " hdmi"
RESIN_CONFIGS_append_orangepi-plus2e = " hdmi"

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed if your machine conf file uses the machine override

RESIN_CONFIGS_DEPS[hdmi] = "\
CONFIG_SUN8I_DE2_CCU=y \
"
Expand Down
1 change: 1 addition & 0 deletions layers/meta-resin-allwinner/recipes-support/resin-init/resin-init-flasher.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Flash to internal eMMC - kernel always enumerates emmc as mmcblk2
INTERNAL_DEVICE_KERNEL_nanopi-neo-air = "mmcblk2"

INTERNAL_DEVICE_KERNEL_orangepi-plus2e = "mmcblk2"

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed if your machine conf file uses the machine override

INTERNAL_DEVICE_KERNEL_orangepi-plus2 = "mmcblk2"
51 changes: 51 additions & 0 deletions orangepi-plus2e.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@

deviceTypesCommon = require '@resin.io/device-types/common'
{ networkOptions, commonImg, instructions } = deviceTypesCommon

postProvisioningInstructions = [
instructions.BOARD_SHUTDOWN
instructions.REMOVE_INSTALL_MEDIA
instructions.BOARD_REPOWER
]

module.exports =
version: 1
slug: 'orangepi-plus2e'
name: 'Orange Pi Plus2e'
arch: 'armv7hf'
state: 'experimental'
community: true

@floion floion Mar 23, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: extra space here


stateInstructions:
postProvisioning: postProvisioningInstructions

instructions: [
instructions.ETCHER_SD
instructions.EJECT_SD
instructions.FLASHER_WARNING
instructions.CONNECT_AND_BOOT
].concat(postProvisioningInstructions)

gettingStartedLink:
windows: 'https://docs.resin.io/orangepi-plus2e/nodejs/getting-started/#adding-your-first-device'
osx: 'https://docs.resin.io/orangepi-plus2e/nodejs/getting-started/#adding-your-first-device'
linux: 'https://docs.resin.io/orangepi-plus2e/nodejs/getting-started/#adding-your-first-device'
supportsBlink: true

options: [ networkOptions.group ]

yocto:
machine: 'orangepi-plus2e'
image: 'resin-image-flasher'
fstype: 'resinos-img'
version: 'yocto-sumo'
deployArtifact: 'resin-image-flasher-orangepi-plus2e.resinos-img'
compressed: true

configuration:
config:
partition:
primary: 1
path: '/config.json'

initialization: commonImg.initialization
99 changes: 99 additions & 0 deletions orangepi-plus2e.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.