From 2adcdcd03afe7670040755ef9c32cd178e088d92 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Fri, 21 Mar 2025 11:45:46 +0000 Subject: [PATCH] linux-firmware_%.bbappend: Prepare for future usrmerge feature The update to support Yocto Scarthgap will force us to enable the usrmerge feature for all Yocto versions we support. Changelog-entry: Prepare linux-firmware for usrmerge feature Signed-off-by: Florin Sarbu --- .../linux-firmware/linux-firmware_%.bbappend | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 6962259..09f1d0a 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 @@ -15,13 +15,13 @@ SRC_URI_append = " \ " do_install_append() { - cp ${WORKDIR}/bcm4329.hcd ${D}/lib/firmware/brcm/bcm4329.hcd - cp ${WORKDIR}/bcm4330.hcd ${D}/lib/firmware/brcm/bcm4330.hcd - cp ${WORKDIR}/bcm43438-sdio.hcd ${D}/lib/firmware/brcm/bcm43438-sdio.hcd - 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 ${WORKDIR}/brcmfmac43362-sdio.txt ${D}/lib/firmware/brcm/brcmfmac43362-sdio.txt + cp ${WORKDIR}/bcm4329.hcd ${D}/${nonarch_base_libdir}/firmware/brcm/bcm4329.hcd + cp ${WORKDIR}/bcm4330.hcd ${D}/${nonarch_base_libdir}/firmware/brcm/bcm4330.hcd + cp ${WORKDIR}/bcm43438-sdio.hcd ${D}/${nonarch_base_libdir}/firmware/brcm/bcm43438-sdio.hcd + cp ${WORKDIR}/brcmfmac43430a0-sdio.bin ${D}/${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.bin + cp ${WORKDIR}/brcmfmac43430a0-sdio.txt ${D}/${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.txt + cp ${WORKDIR}/config.txt ${D}/${nonarch_base_libdir}/firmware/brcm/config.txt + cp ${WORKDIR}/brcmfmac43362-sdio.txt ${D}/${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.txt } do_install_append_nanopi-neo-air() {