From ff89c3c5a05bca38cdc0cccbd7b3145efc181fae Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:02:58 +0000 Subject: [PATCH 01/12] .gitmodules: Add meta-sunxi-contrib submodule layer To support WiFi for OrangePi-Plus2E Changelog-entry: Add meta-sunxi-contrib submodule layer Signed-off-by: Alex J Lennon --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index d500f4695..afd12b3bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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"] + path = layers/meta-sunxi-contrib + url = https://github.com/geomatsi/meta-sunxi-contrib.git From 58e3fe01faa81779db4bf27754d7c6542e6afac8 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:08:39 +0000 Subject: [PATCH 02/12] layers/meta-resin-allwinner: Add dependency on meta-sunxi-contrib Add a default dependency to bblayers to provide access to WiFi driver for OrangePi-Plus2E Changelog-entry: Add default dependency on meta-sunxi-contrib Signed-off-by: Alex J Lennon --- layers/meta-resin-allwinner/conf/samples/bblayers.conf.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/layers/meta-resin-allwinner/conf/samples/bblayers.conf.sample b/layers/meta-resin-allwinner/conf/samples/bblayers.conf.sample index 2aa6061c7..29d7fb08f 100644 --- a/layers/meta-resin-allwinner/conf/samples/bblayers.conf.sample +++ b/layers/meta-resin-allwinner/conf/samples/bblayers.conf.sample @@ -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 \ From ac361357c75f267ebfe2987eb6a15ce2438988d8 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:09:53 +0000 Subject: [PATCH 03/12] layers/meta-resin-allwinner: Add config. for OrangePi-Plus2E image Provide needed bitbake meta data to build OrangePi-Plus2E output image. Changelog-entry: Add config. for OrangePi-Plus2E image build Signed-off-by: Alex J Lennon --- .../recipes-core/images/resin-image.inc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/layers/meta-resin-allwinner/recipes-core/images/resin-image.inc b/layers/meta-resin-allwinner/recipes-core/images/resin-image.inc index aa6fa1eb0..68a3df782 100644 --- a/layers/meta-resin-allwinner/recipes-core/images/resin-image.inc +++ b/layers/meta-resin-allwinner/recipes-core/images/resin-image.inc @@ -1,3 +1,21 @@ +# +# Orange Pi Plus2e +# + +IMAGE_FSTYPES_append_orangepi-plus2e = " resinos-img" + +# Customize resinos-img +RESIN_IMAGE_BOOTLOADER_orangepi-plus2e = "u-boot" +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 () { + # 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 # From 57f3fbb178d2e66b8905061bca09078692817eec Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:12:28 +0000 Subject: [PATCH 04/12] layers/meta-resin-allwinner: Add connectivity config. for rtl8189fs-mod Provide WiFi driver specific connectivity configuration (rtl8189fs-mod) for OrangePi-Plus-2E board. Changelog-entry: Add connectivity config. for OrangePi-Plus2E WiFi Signed-off-by: Alex J Lennon --- .../packagegroups/packagegroup-resin-connectivity.bbappend | 1 + 1 file changed, 1 insertion(+) diff --git a/layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend b/layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend index 7c28e90fc..eb4947865 100644 --- a/layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend +++ b/layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend @@ -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" CONNECTIVITY_MODULES_append_orange-pi-zero = " xradio" CONNECTIVITY_FIRMWARES_append_orange-pi-zero = " xradio-firmware" From 0cf30e116e025dadc9a5a37b219259bde16482d1 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:17:52 +0000 Subject: [PATCH 05/12] layers/meta-resin-allwinner: Configure linux kernel for OrangePi-Plus2E Copy configuration for 2E based on -Plus2 (i.e. pl2303, wifi, hdmi) Changelog-entry: Configure linux kernel for OrangePi-Plus2E Signed-off-by: Alex J Lennon --- .../recipes-kernel/linux/linux-mainline_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend index b897662c0..b6d06a4ec 100644 --- a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend +++ b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend @@ -18,6 +18,7 @@ RESIN_CONFIGS[axp_power] ="\ " RESIN_CONFIGS_append_orangepi-plus2 = " wifi" +RESIN_CONFIGS_append_orangepi-plus2e = " wifi" RESIN_CONFIGS_append_orange-pi-zero = " wifi" RESIN_CONFIGS[wifi] ="\ CONFIG_WIRELESS=y \ @@ -27,6 +28,7 @@ RESIN_CONFIGS[wifi] ="\ " RESIN_CONFIGS_append_orangepi-plus2 = " pl2303" +RESIN_CONFIGS_append_orangepi-plus2e = " pl2303" RESIN_CONFIGS_DEPS[pl2303] = "\ CONFIG_USB_SERIAL=m \ " @@ -35,6 +37,7 @@ RESIN_CONFIGS[pl2303] ="\ " RESIN_CONFIGS_append_orangepi-plus2 = " hdmi" +RESIN_CONFIGS_append_orangepi-plus2e = " hdmi" RESIN_CONFIGS_DEPS[hdmi] = "\ CONFIG_SUN8I_DE2_CCU=y \ " From bd020b0971e5165f63893cadeca3986ef9d2af43 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:19:46 +0000 Subject: [PATCH 06/12] layers/meta-resin-allwinner: Configure OrangePi-Plus2E internal storage Configure internal storage device based on OrangePi-Plus2 i.e. 'emmc' is 'mmcblk2' Changelog-entry: Configure OrangePi-Plus2E internal storage Signed-off-by: Alex J Lennon --- .../recipes-support/resin-init/resin-init-flasher.bbappend | 1 + 1 file changed, 1 insertion(+) diff --git a/layers/meta-resin-allwinner/recipes-support/resin-init/resin-init-flasher.bbappend b/layers/meta-resin-allwinner/recipes-support/resin-init/resin-init-flasher.bbappend index 428cbd8b5..b355d22a5 100644 --- a/layers/meta-resin-allwinner/recipes-support/resin-init/resin-init-flasher.bbappend +++ b/layers/meta-resin-allwinner/recipes-support/resin-init/resin-init-flasher.bbappend @@ -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" INTERNAL_DEVICE_KERNEL_orangepi-plus2 = "mmcblk2" From 76464ad0ad5e225deffb0899bbf68ae9492989e8 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:21:26 +0000 Subject: [PATCH 07/12] layers/meta-resin-allwinner: Add OrangePi-Plus2E machine configuration Add OrangePi-Plus2E machine configuration for Bitbake. Changelog-entry: Add OrangePi-Plus2E machine configuration for Bitbake Signed-off-by: Alex J Lennon --- .../conf/machine/orangepi-plus2e.conf | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 layers/meta-resin-allwinner/conf/machine/orangepi-plus2e.conf diff --git a/layers/meta-resin-allwinner/conf/machine/orangepi-plus2e.conf b/layers/meta-resin-allwinner/conf/machine/orangepi-plus2e.conf new file mode 100644 index 000000000..ae7750343 --- /dev/null +++ b/layers/meta-resin-allwinner/conf/machine/orangepi-plus2e.conf @@ -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 + +KERNEL_DEVICETREE = "sun8i-h3-orangepi-plus2e.dtb" +UBOOT_MACHINE = "orangepi_plus2e_defconfig" +PREFERRED_VERSION_linux-mainline = "4.17.3" From 7cdd33abdebca3ac7e2f9d034bf855cf971e30e0 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:22:41 +0000 Subject: [PATCH 08/12] layers/meta-resin-allwinner: Add OrangePi-Plus2E SVG image This is a straight copy of the OrangePi-Plus2 image added as a placeholder (i.e. may need to be changed in future). Changelog-entry: Add OrangePi-Plus2E SVG image Signed-off-by: Alex J Lennon --- orangepi-plus2e.svg | 99 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 orangepi-plus2e.svg diff --git a/orangepi-plus2e.svg b/orangepi-plus2e.svg new file mode 100644 index 000000000..727bf1ff1 --- /dev/null +++ b/orangepi-plus2e.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c74a8efbd408600fd7eacf9fa92b827f406a74f6 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 14 Mar 2019 16:24:16 +0000 Subject: [PATCH 09/12] layers/meta-resin-allwinner: Add OrangePi-Plus2E COFFEE file Add OrangePi-Plus2E COFFEE file for Belana.io barys build. Changelog-entry: Add OrangePi-Plus2E COFFEE file Signed-off-by: Alex J Lennon --- orangepi-plus2e.coffee | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 orangepi-plus2e.coffee diff --git a/orangepi-plus2e.coffee b/orangepi-plus2e.coffee new file mode 100644 index 000000000..b695309e8 --- /dev/null +++ b/orangepi-plus2e.coffee @@ -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 + + 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 From 96eb0c2c2691d79f1e7fb4ac8b356db8833b091a Mon Sep 17 00:00:00 2001 From: Michel Wohlert Date: Fri, 22 Mar 2019 10:20:57 +0100 Subject: [PATCH 10/12] xradio.bb: Add xradio driver Add xradio driver for XR819 Wifi chipsets Changelog-entry: Add xradio out-of-tree kernel module --- .../recipes-kernel/xradio/xradio.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 layers/meta-resin-allwinner/recipes-kernel/xradio/xradio.bb diff --git a/layers/meta-resin-allwinner/recipes-kernel/xradio/xradio.bb b/layers/meta-resin-allwinner/recipes-kernel/xradio/xradio.bb new file mode 100644 index 000000000..532857fb7 --- /dev/null +++ b/layers/meta-resin-allwinner/recipes-kernel/xradio/xradio.bb @@ -0,0 +1,16 @@ +SUMMARY = "Xradio WiFi driver for orangepi-zero" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb" + +inherit module + +SRCREV = "b7789c274091344eeff47cf34a48e0b225de852b" + +SRC_URI = "git://github.com/fifteenhex/xradio.git;protocol=https \ + " + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE += "-C ${STAGING_KERNEL_DIR} M=${S}" + +KERNEL_MODULE_AUTOLOAD += "xradio_wlan" \ No newline at end of file From c5a3c29ffa243ac85461086a866ed7ce1071b2aa Mon Sep 17 00:00:00 2001 From: Michel Wohlert Date: Fri, 22 Mar 2019 10:22:03 +0100 Subject: [PATCH 11/12] xradio-firmware.bb: Add xradio firmware Add xradio firmware blobs for XR819 Changelog-entry: Add xradio firmware for XR819 Chipset --- .../xradio-firmware/xradio-firmware.bb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 layers/meta-resin-allwinner/recipes-kernel/xradio-firmware/xradio-firmware.bb diff --git a/layers/meta-resin-allwinner/recipes-kernel/xradio-firmware/xradio-firmware.bb b/layers/meta-resin-allwinner/recipes-kernel/xradio-firmware/xradio-firmware.bb new file mode 100644 index 000000000..5ca1077c0 --- /dev/null +++ b/layers/meta-resin-allwinner/recipes-kernel/xradio-firmware/xradio-firmware.bb @@ -0,0 +1,22 @@ +SUMMARY = "Xradio xr819 WiFi firmware" +LICENSE = "CC0-1.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1" + +SRCREV = "bddd21b7f895be9f0c37e435f0a7ac84405c6091" + +SRC_URI = "git://github.com/armbian/firmware.git;protocol=https" + +S = "${WORKDIR}/git" + +do_compile () { + exit 0 +} + +do_install() { + install -d ${D}${base_libdir}/firmware/xr819 + install -m 0644 ${S}/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/ + install -m 0644 ${S}/xr819/sdd_xr819.bin ${D}${base_libdir}/firmware/xr819/ + install -m 0644 ${S}/xr819/fw_xr819.bin ${D}${base_libdir}/firmware/xr819/ +} + +FILES_${PN} = "${base_libdir}/*" From 2c892889efa101cf16c148896a60f73ae9406130 Mon Sep 17 00:00:00 2001 From: Resin CI <34882892+resin-ci@users.noreply.github.com> Date: Fri, 22 Mar 2019 15:36:56 +0200 Subject: [PATCH 12/12] v2.27.0+rev5 --- .versionbot/CHANGELOG.yml | 17 +++++++++++++++++ CHANGELOG.md | 6 ++++++ VERSION | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index 51211a254..0cf68bee9 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,20 @@ +- commits: + - subject: Add xradio firmware for XR819 Chipset + hash: 5fd7b1467e3588a87fb78518c6fef5b1b3703cc5 + body: '' + footer: + Changelog-entry: Add xradio firmware for XR819 Chipset + changelog-entry: Add xradio firmware for XR819 Chipset + author: Michel Wohlert + - subject: Add xradio out-of-tree kernel module + hash: ad124c7a9e39a98862b33ef152019e4e0366528d + body: '' + footer: + Changelog-entry: Add xradio out-of-tree kernel module + changelog-entry: Add xradio out-of-tree kernel module + author: Michel Wohlert + version: 2.27.0+rev5 + date: 2019-03-22T09:32:01.155Z - commits: - subject: Mark orange-pi-zero as community in the .coffee file hash: 4b49b3d03d907bf544689aa30fc3378d0cc9c478 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e5aef8cb..de4e94c46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Change log ----------- +# v2.27.0+rev5 +## (2019-03-22) + +* Add xradio firmware for XR819 Chipset [Michel Wohlert] +* Add xradio out-of-tree kernel module [Michel Wohlert] + # v2.27.0+rev4 ## (2019-03-07) diff --git a/VERSION b/VERSION index 4ded0a220..e0601ec4b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.27.0+rev4 \ No newline at end of file +2.27.0+rev5 \ No newline at end of file