From beb1e49f435e1bf65e257d82935cf6b9c06d1ec7 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Tue, 10 Jan 2023 14:42:23 -0700
Subject: imx-dsp*: Upgrade 2.0.1 -> 2.0.2

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 9b4d488ec8455315753e2acf1724b00d0d78a723)
---
 .../imx-dsp/imx-dsp-codec-ext_2.0.1.bb             | 21 --------
 .../imx-dsp/imx-dsp-codec-ext_2.0.2.bb             | 21 ++++++++
 recipes-multimedia/imx-dsp/imx-dsp_2.0.1.bb        | 57 ----------------------
 recipes-multimedia/imx-dsp/imx-dsp_2.0.2.bb        | 56 +++++++++++++++++++++
 4 files changed, 77 insertions(+), 78 deletions(-)
 delete mode 100644 recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.1.bb
 create mode 100644 recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.2.bb
 delete mode 100644 recipes-multimedia/imx-dsp/imx-dsp_2.0.1.bb
 create mode 100644 recipes-multimedia/imx-dsp/imx-dsp_2.0.2.bb

diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.1.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.1.bb
deleted file mode 100644
index 1ee90c384..000000000
--- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2018-2021 NXP
-
-DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
-
-inherit fsl-eula-unpack autotools pkgconfig
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-
-SRC_URI[md5sum] = "bb533c612e688d1ad0de028f19fefbf5"
-SRC_URI[sha256sum] = "8f26dd1bdd08c4136da0fd67342cbac1c5c2f95a0dc33b1d71a64e0f8e1938a7"
-
-# Fix strip command failed: 'Unable to recognise the format of the input file'
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INSANE_SKIP:${PN} = "arch dev-so"
-
-FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm"
-COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.2.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.2.bb
new file mode 100644
index 000000000..49497f816
--- /dev/null
+++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.2.bb
@@ -0,0 +1,21 @@
+# Copyright 2018-2021 NXP
+
+DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "80f1ea02e8af55f08efcc1014b51565b"
+SRC_URI[sha256sum] = "3575152bb1372842b07794e7daafb8282827ce301c1c944bd1c2b5fc12120671"
+
+# Fix strip command failed: 'Unable to recognise the format of the input file'
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INSANE_SKIP:${PN} = "arch dev-so"
+
+FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm"
+COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.0.1.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.0.1.bb
deleted file mode 100644
index 9e634b605..000000000
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.0.1.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2017-2022 NXP
-
-DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
-
-inherit fsl-eula-unpack autotools pkgconfig
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-
-SRC_URI[md5sum] = "71e18d4518551f665fa0258ccf6605b0"
-SRC_URI[sha256sum] = "7441cf3cbdc12058f2841a708b1374c637d2a171cca17a348338ebf4580a417e"
-
-EXTRA_OECONF = " \
-    -datadir=${base_libdir}/firmware \
-    --bindir=/unit_tests \
-    ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', '', d)} \
-"
-
-RDEPENDS:${PN} += " imx-dsp-codec-ext"
-
-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"
-
-UNSUPPORTED_TESTS                = "dsp_tflm"
-UNSUPPORTED_TESTS:mx8ulp-nxp-bsp = ""
-
-do_install:append () {
-    # 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
-    # Remove unit tests not for this platform
-    for unsupported_test in ${UNSUPPORTED_TESTS}; do
-        find ${D}/unit_tests/DSP -name $unsupported_test* -exec rm {} \;
-    done
-}
-
-FILES:${PN} = "${libdir}/imx-mm/audio-codec/dsp \
-               ${libdir}/imx-mm/audio-codec/wrap \
-               ${base_libdir}/firmware/imx/dsp \
-               /unit_tests \
-"
-
-INSANE_SKIP:${PN} = "already-stripped arch ldflags dev-so"
-
-# Fix strip command failed: 'Unable to recognise the format of the input file'
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.0.2.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.0.2.bb
new file mode 100644
index 000000000..76b7d7867
--- /dev/null
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.0.2.bb
@@ -0,0 +1,56 @@
+# Copyright 2017-2022 NXP
+
+DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "1ba2634775bf9b7a66fe25ce72195aca"
+SRC_URI[sha256sum] = "f3fb2f61dc3d9a5ae4e42474d309d891f6ac710540b47adb147df33560629aa8"
+
+EXTRA_OECONF = " \
+    -datadir=${base_libdir}/firmware \
+    --bindir=/unit_tests \
+    ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', '', d)} \
+"
+
+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"
+
+UNSUPPORTED_TESTS                = "dsp_tflm"
+UNSUPPORTED_TESTS:mx8ulp-nxp-bsp = ""
+
+do_install:append () {
+    # 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
+    # Remove unit tests not for this platform
+    for unsupported_test in ${UNSUPPORTED_TESTS}; do
+        find ${D}/unit_tests/DSP -name $unsupported_test* -exec rm {} \;
+    done
+}
+
+FILES:${PN} = "${libdir}/imx-mm/audio-codec/dsp \
+               ${libdir}/imx-mm/audio-codec/wrap \
+               ${base_libdir}/firmware/imx/dsp \
+               /unit_tests \
+"
+RDEPENDS:${PN} += "imx-dsp-codec-ext"
+
+INSANE_SKIP:${PN} = "already-stripped arch ldflags dev-so"
+
+# Fix strip command failed: 'Unable to recognise the format of the input file'
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"
-- 
cgit v1.2.3-54-g00ecf