From 83bb034ca4863824c82ffea8fbc9d6ef30a2360c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 8 Aug 2023 18:00:28 +0200 Subject: linux-firmware: unpack imx-firmware in a subfolder of linux-firmware Rather than unpacking in ${WORKDIR}/imx-firmware, unpack it in ${S}/imx-firmware and adjust the install commands accordingly. This in preparation of properly adding the imx-firmware licence info. When using the openembedded-core create-spdx-2.2.bbclass the specified files are to be specified relative to ${S} which is easier to achieve if in a subdirectory of ${S}. Related-to: ELB-5247 Signed-off-by: Max Krummenacher (cherry picked from commit ee4386c2420368eb447ca6255bc387f16fe2097b) --- recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 418a2e9..4d7e1ca 100644 --- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -1,7 +1,7 @@ IMX_FIRMWARE_SRC ?= "git://github.com/NXP/imx-firmware.git;protocol=https" SRCBRANCH_imx-firmware = "lf-6.1.22_2.0.0" SRC_URI += " \ - ${IMX_FIRMWARE_SRC};branch=${SRCBRANCH_imx-firmware};destsuffix=imx-firmware;name=imx-firmware \ + ${IMX_FIRMWARE_SRC};branch=${SRCBRANCH_imx-firmware};destsuffix=${S}/imx-firmware;name=imx-firmware \ " SRCREV_imx-firmware = "f775d53ca3a478c85e8c8a880e44cc269bd14db0" @@ -11,19 +11,19 @@ SRCREV_FORMAT = "default_imx-firmware" do_install:append () { # Install common IMX firmware files 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 imx-firmware/nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp # Install NXP Connectivity SDIO8997 firmware - 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 + install -m 0644 imx-firmware/nxp/FwImage_8997_SD/ed_mac_ctrl_V3_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 imx-firmware/nxp/FwImage_8997_SD/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 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 # Install IW416 firmware - install -m 0644 ${WORKDIR}/imx-firmware/nxp/FwImage_IW416_SD/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 imx-firmware/nxp/FwImage_IW416_SD/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin } -- cgit v1.2.3