From 18e03f3806b1f41194259dc412c10b309c6f5171 Mon Sep 17 00:00:00 2001 From: Andrejs Cainikovs Date: Tue, 24 May 2022 09:51:41 +0200 Subject: 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 --- recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'recipes-kernel/linux-firmware/linux-firmware_%.bbappend') diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index b6bf6e4..a2b35da 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 + lnr ${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/* \ " -- cgit v1.2.3