1 files 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 \