From ed878b1b420633acaff32182652ff2d5b35679e4 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 23 Sep 2021 18:24:31 +0200 Subject: [PATCH 1/5] balena-yocto-scripts: Update to v1.14.9 Update balena-yocto-scripts from 1.11.0 to 1.14.9 Changelog-entry: Update balena-yocto-scripts from v1.11.0 to v1.14.9 Signed-off-by: Alex Gonzalez --- balena-yocto-scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balena-yocto-scripts b/balena-yocto-scripts index 3cfb908..4bfb805 160000 --- a/balena-yocto-scripts +++ b/balena-yocto-scripts @@ -1 +1 @@ -Subproject commit 3cfb908769d20683ccbda0ad0e565d64f8cb9760 +Subproject commit 4bfb805f24a1e260f708c63e5dfedea9dade3cd2 From d284e7c474147c16242950c53c045a74d62d8054 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 23 Sep 2021 18:27:00 +0200 Subject: [PATCH 2/5] layers/meta-balena: Update to v2.85.4 Update meta-balena from 2.79.7 to 2.85.4 Changelog-entry: Update meta-balena from v2.79.7 to v2.85.4 Signed-off-by: Alex Gonzalez --- layers/meta-balena | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-balena b/layers/meta-balena index dd5ffc1..700b93a 160000 --- a/layers/meta-balena +++ b/layers/meta-balena @@ -1 +1 @@ -Subproject commit dd5ffc1010b5d43b211c62118768f714bafe076c +Subproject commit 700b93a1b7b777b31c919a28628f7be48abdfb0f From 8680c9a5ca9a39e266ed5d6145938c2224d567f0 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 23 Sep 2021 12:45:56 +0200 Subject: [PATCH 3/5] linux-firmware: Remove custom brcm43362 packaging This is now packaged in meta-balena. Changelog-entry: linux-firmware: Remove custom brcm43362 packaging Signed-off-by: Alex Gonzalez --- .../linux-firmware/linux-firmware_%.bbappend | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/layers/meta-balena-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index e205995..39daeb0 100644 --- a/layers/meta-balena-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/layers/meta-balena-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -8,7 +8,6 @@ SRC_URI_append = " \ file://brcmfmac43430a0-sdio.bin \ file://brcmfmac43430a0-sdio.txt \ file://config.txt \ - file://brcmfmac43362-sdio.txt \ file://brcmfmac43430-sdio.txt \ file://bcm43438a0.hcd \ file://bcm43438a1.hcd \ @@ -21,8 +20,6 @@ do_install_append() { cp ${WORKDIR}/brcmfmac43430a0-sdio.bin ${D}/lib/firmware/brcm/brcmfmac43430a0-sdio.bin cp ${WORKDIR}/brcmfmac43430a0-sdio.txt ${D}/lib/firmware/brcm/brcmfmac43430a0-sdio.txt cp ${WORKDIR}/config.txt ${D}/lib/firmware/brcm/config.txt - cp ${S}/brcm/brcmfmac43362-sdio.bin ${D}/lib/firmware/brcm/ - cp ${WORKDIR}/brcmfmac43362-sdio.txt ${D}/lib/firmware/brcm/ } do_install_append_nanopi-neo-air() { @@ -32,7 +29,7 @@ do_install_append_nanopi-neo-air() { install -m 0644 ${WORKDIR}/bcm43438a1.hcd ${D}${nonarch_base_libdir}/firmware/brcm } -PACKAGES =+ "${PN}-ap6212 ${PN}-brcm43362" +PACKAGES =+ "${PN}-ap6212" FILES_${PN}-ap6212 = " \ /lib/firmware/brcm/bcm4329.hcd \ @@ -45,11 +42,6 @@ FILES_${PN}-ap6212 = " \ /lib/firmware/brcm/bcm43438a1.hcd \ " -FILES_${PN}-brcm43362 = " \ - /lib/firmware/brcm/brcmfmac43362-sdio.bin \ - /lib/firmware/brcm/brcmfmac43362-sdio.txt \ -" - FILES_${PN}-bcm43430_append_nanopi-neo-air = " \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \ " From c730c68edc837c449359c72c81b412e51071813b Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 23 Sep 2021 12:47:19 +0200 Subject: [PATCH 4/5] packagegroup-balena-connectivity: Add linux-firmware-bcm43362 This meta-balena package replaces the custom brcm43362 removed in the previous commit. Changelog-entry: packagegroup-balena-connectivity: Add linux-firmware-bcm43362 Signed-off-by: Alex Gonzalez --- .../packagegroups/packagegroup-balena-connectivity.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-balena-allwinner/recipes-core/packagegroups/packagegroup-balena-connectivity.bbappend b/layers/meta-balena-allwinner/recipes-core/packagegroups/packagegroup-balena-connectivity.bbappend index 7c28e90..aac8d05 100644 --- a/layers/meta-balena-allwinner/recipes-core/packagegroups/packagegroup-balena-connectivity.bbappend +++ b/layers/meta-balena-allwinner/recipes-core/packagegroups/packagegroup-balena-connectivity.bbappend @@ -1,4 +1,4 @@ -CONNECTIVITY_FIRMWARES_append = " linux-firmware-ap6212 linux-firmware-brcm43362" +CONNECTIVITY_FIRMWARES_append = " linux-firmware-ap6212 linux-firmware-bcm43362" CONNECTIVITY_MODULES_append_orangepi-plus2 = " rtl8189" CONNECTIVITY_MODULES_append_orange-pi-zero = " xradio" From 5ad052f26292c1ffd30841b5345b1759e0db4a88 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 23 Sep 2021 12:51:45 +0200 Subject: [PATCH 5/5] linux-mainline: Remove config check warnings * Both CONFIG_USB_SERIAL and CONFIG_USB_SERIAL_PL2303 are now built-in in the meta-balena kernel class. * Add dependencies for CONFIG_DRM_SUN8I_DW_HDMI * CONFIG_CONFIGFS_FS is already built-in in defconfig, so cannot force it to build a module Changelog-entry: linux-mainline: Remove config check warnings Signed-off-by: Alex Gonzalez --- .../recipes-kernel/linux/linux-mainline_%.bbappend | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend index 4855943..24301c5 100644 --- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend +++ b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend @@ -47,16 +47,10 @@ BALENA_CONFIGS[wifi] ="\ CONFIG_WLAN_VENDOR_REALTEK=y \ " -BALENA_CONFIGS_append_orangepi-plus2 = " pl2303" -BALENA_CONFIGS_DEPS[pl2303] = "\ - CONFIG_USB_SERIAL=m \ -" -BALENA_CONFIGS[pl2303] ="\ - CONFIG_USB_SERIAL_PL2303=m \ -" - BALENA_CONFIGS_append_orangepi-plus2 = " hdmi" BALENA_CONFIGS_DEPS[hdmi] = "\ + CONFIG_DRM=y \ + CONFIG_DRM_SUN4I=y \ CONFIG_SUN8I_DE2_CCU=y \ " BALENA_CONFIGS[hdmi] ="\ @@ -92,7 +86,7 @@ BALENA_CONFIGS_append = " \ BALENA_CONFIGS[configfs] = " \ CONFIG_OF_CONFIGFS=y \ CONFIG_OF_OVERLAY=y \ - CONFIG_CONFIGFS_FS=m \ + CONFIG_CONFIGFS_FS=y \ " BALENA_CONFIGS_append_nanopi-neo-air = " hciuart"