summaryrefslogtreecommitdiff
path: root/recipes-kernel
diff options
context:
space:
mode:
authorAndrejs Cainikovs <andrejs.cainikovs@toradex.com>2022-05-24 09:51:41 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-06-06 17:42:12 +0200
commit40873768aa198a91e33528ae7a618c9f29e3bc01 (patch)
tree1658ab78bad168182b02d7a6b46a981a8487b9a7 /recipes-kernel
parent5458e7f6fc634a056fd6a39cca247ac5ddb81c5d (diff)
linux-firmware: adjust SD8997 firmware location
Now, when SD-UART firmware handling is in the upstream, we need to adjust to new firmware location, thus removing a hackish way of having to overwrite the original firmware file. Related-to: ELB-4452 Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com> (cherry picked from commit 18e03f3806b1f41194259dc412c10b309c6f5171) replaced lnr command no longer available with ln -frs Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux-firmware/linux-firmware_%.bbappend15
1 files changed, 8 insertions, 7 deletions
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 91d84f8..fe5739c 100644
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -9,20 +9,21 @@ SRCREV_imx-firmware = "a312213179f671cecba5f32aa839cc752a3e817f"
SRCREV_FORMAT = "default_imx-firmware"
do_install:append () {
- install -d ${D}${sysconfdir}/firmware
-
- # Install NXP Connectivity
- install -d ${D}${nonarch_base_libdir}/firmware/nxp
- install -m 0644 ${WORKDIR}/imx-firmware/nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp
-
# Install NXP Connectivity SDIO8997 firmware
+ install -d ${D}${nonarch_base_libdir}/firmware/nxp
+ install -m 0644 ${WORKDIR}/imx-firmware/nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp
install -m 0644 ${WORKDIR}/imx-firmware/nxp/FwImage_8997_SD/ed_mac_ctrl_V3_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp
install -m 0644 ${WORKDIR}/imx-firmware/nxp/FwImage_8997_SD/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp
install -m 0644 ${WORKDIR}/imx-firmware/nxp/FwImage_8997_SD/txpwrlimit_cfg_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp
+
+ # Upstream SDIO8997 driver firmware is located elsewhere
+ install -d ${D}${nonarch_base_libdir}/firmware/mrvl
+ ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin
}
PACKAGES =+ " ${PN}-nxp89xx"
FILES:${PN}-nxp89xx = " \
- ${nonarch_base_libdir}/firmware/nxp/* \
+ ${nonarch_base_libdir}/firmware/nxp/* \
+ ${nonarch_base_libdir}/firmware/mrvl/* \
"