pomfi/balena-allwinner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #145 from balena-os/alexgg/update

Browse source 
Update to latest meta-balena and balena-yocto-scripts
This commit is contained in:
bulldozer-balena[bot] 2021-09-23 18:02:47 +00:00 • committed by GitHub
commit 3fc2b6761f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
balena-yocto-scripts

@ -1 +1 @@
Subproject commit 3cfb908769d20683ccbda0ad0e565d64f8cb9760 Subproject commit 4bfb805f24a1e260f708c63e5dfedea9dade3cd2

2
layers/meta-balena

@ -1 +1 @@
Subproject commit dd5ffc1010b5d43b211c62118768f714bafe076c Subproject commit 700b93a1b7b777b31c919a28628f7be48abdfb0f

2
layers/meta-balena-allwinner/recipes-core/packagegroups/packagegroup-balena-connectivity.bbappend
View file

@ -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_orangepi-plus2 = " rtl8189"
CONNECTIVITY_MODULES_append_orange-pi-zero = " xradio" CONNECTIVITY_MODULES_append_orange-pi-zero = " xradio"

10
layers/meta-balena-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
View file

@ -8,7 +8,6 @@ SRC_URI_append = " \
file://brcmfmac43430a0-sdio.bin \ file://brcmfmac43430a0-sdio.bin \
file://brcmfmac43430a0-sdio.txt \ file://brcmfmac43430a0-sdio.txt \
file://config.txt \ file://config.txt \
file://brcmfmac43362-sdio.txt \
file://brcmfmac43430-sdio.txt \ file://brcmfmac43430-sdio.txt \
file://bcm43438a0.hcd \ file://bcm43438a0.hcd \
file://bcm43438a1.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.bin ${D}/lib/firmware/brcm/brcmfmac43430a0-sdio.bin
cp ${WORKDIR}/brcmfmac43430a0-sdio.txt ${D}/lib/firmware/brcm/brcmfmac43430a0-sdio.txt cp ${WORKDIR}/brcmfmac43430a0-sdio.txt ${D}/lib/firmware/brcm/brcmfmac43430a0-sdio.txt
cp ${WORKDIR}/config.txt ${D}/lib/firmware/brcm/config.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() { 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 install -m 0644 ${WORKDIR}/bcm43438a1.hcd ${D}${nonarch_base_libdir}/firmware/brcm
} }
PACKAGES =+ "${PN}-ap6212 ${PN}-brcm43362" PACKAGES =+ "${PN}-ap6212"
FILES_${PN}-ap6212 = " \ FILES_${PN}-ap6212 = " \
/lib/firmware/brcm/bcm4329.hcd \ /lib/firmware/brcm/bcm4329.hcd \
@ -45,11 +42,6 @@ FILES_${PN}-ap6212 = " \
/lib/firmware/brcm/bcm43438a1.hcd \ /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 = " \ FILES_${PN}-bcm43430_append_nanopi-neo-air = " \
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \
" "

12
layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
View file

@ -47,16 +47,10 @@ BALENA_CONFIGS[wifi] ="\
CONFIG_WLAN_VENDOR_REALTEK=y \ 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_append_orangepi-plus2 = " hdmi"
BALENA_CONFIGS_DEPS[hdmi] = "\ BALENA_CONFIGS_DEPS[hdmi] = "\
CONFIG_DRM=y \
CONFIG_DRM_SUN4I=y \
CONFIG_SUN8I_DE2_CCU=y \ CONFIG_SUN8I_DE2_CCU=y \
" "
BALENA_CONFIGS[hdmi] ="\ BALENA_CONFIGS[hdmi] ="\
@ -92,7 +86,7 @@ BALENA_CONFIGS_append = " \
BALENA_CONFIGS[configfs] = " \ BALENA_CONFIGS[configfs] = " \
CONFIG_OF_CONFIGFS=y \ CONFIG_OF_CONFIGFS=y \
CONFIG_OF_OVERLAY=y \ CONFIG_OF_OVERLAY=y \
CONFIG_CONFIGFS_FS=m \ CONFIG_CONFIGFS_FS=y \
" "
BALENA_CONFIGS_append_nanopi-neo-air = " hciuart" BALENA_CONFIGS_append_nanopi-neo-air = " hciuart"