From 831614eadfa528e559f6553cf019b4caf782f5de Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 1 Sep 2022 16:49:38 -0500 Subject: imx-dsp: Rework the install logic [LF-5799] Replace the firmware name variable with a simpler firmware platform variable. This allows the logic that removes firmware that is not for this platform to handle any firmware, not just the main binary. Also, make the default value of the variable UNDEFINED. Then, if a new SOC is not properly added to the variable list, the mv will fail. Signed-off-by: Tom Hochstein (cherry picked from commit be58b76e47971eb4c8ce645e5ba88d7e5056a102) --- recipes-multimedia/imx-dsp/imx-dsp_2.0.0.bb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.0.0.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.0.0.bb index 03b22167c..336bf34d2 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp_2.0.0.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp_2.0.0.bb @@ -19,14 +19,18 @@ EXTRA_OECONF = " \ RDEPENDS:${PN} += " imx-dsp-codec-ext" -HIFI4_BIN ?= "hifi4_imx8qmqxp.bin" -HIFI4_BIN:mx8mp-nxp-bsp = "hifi4_imx8mp.bin" -HIFI4_BIN:mx8ulp-nxp-bsp = "hifi4_imx8ulp.bin" +HIFI4_PLATFORM ?= "HIFI4_PLATFORM_IS_UNDEFINED" +HIFI4_PLATFORM:mx8qm-nxp-bsp = "imx8qmqxp" +HIFI4_PLATFORM:mx8qxp-nxp-bsp = "imx8qmqxp" +HIFI4_PLATFORM:mx8dx-nxp-bsp = "imx8qmqxp" +HIFI4_PLATFORM:mx8mp-nxp-bsp = "imx8mp" +HIFI4_PLATFORM:mx8ulp-nxp-bsp = "imx8ulp" do_install:append () { - # Rename DSP Firmware into hifi4.bin and remove unneeded binary - mv ${D}/lib/firmware/imx/dsp/${HIFI4_BIN} ${D}/lib/firmware/imx/dsp/hifi4.bin - find ${D}/lib/firmware/imx/dsp -name hifi4_*.bin -exec rm {} \; + # Remove firmware not for this platform + find ${D}/${base_libdir}/firmware/imx/dsp -name hifi4_*.bin -not -name *${HIFI4_PLATFORM}* -exec rm {} \; + # Set the expected generic name for the firmware + mv ${D}/${base_libdir}/firmware/imx/dsp/hifi4_${HIFI4_PLATFORM}.bin ${D}/${base_libdir}/firmware/imx/dsp/hifi4.bin } FILES:${PN} = "${libdir}/imx-mm/audio-codec/dsp \ -- cgit v1.2.3-54-g00ecf