firmware-ele-imx: Update to 2.0.2.1 aligned with LF6.6.52-2.2.1

Update the recipe to be aligned with the NXP BSP LF6.6.52-2.2.1.

Changes:
* firmware-ele-imx_1.3.0.bb -> firmware-ele-imx_2.0.2.1.bb
* Install both runtime firmware versions for the i.MX95 (A0 and B0)
* Simplify packaging: don't create separate packages for the fw

Signed-off-by: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>

2 files changed, 10 insertions, 15 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 38afca6f8..50566bbbc 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -504,8 +504,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 "
 
 # ELE extra Firmware
-SECOEXT_FIRMWARE_NAME ?= "UNDEFINED"
+SECOEXT_FIRMWARE_NAME                    ?= ""
 SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img"
+SECOEXT_FIRMWARE_NAME:mx95-generic-bsp   ?= "mx95a0runtime-ahab-container.img mx95b0runtime-ahab-container.img"
 
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN                ?= ""
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.1.bb
index 8a812f413..821d6e5a1 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_1.3.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.2.1.bb
@@ -3,13 +3,13 @@ SUMMARY = "NXP i.MX ELE firmware"
 DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "17945fc"
-SRC_URI[sha256sum] = "8791109824767346237e53ac2c712824e54608e2092859161e6bb3e5385a7595"
+IMX_SRCREV_ABBREV = "d30b14a"
+SRC_URI[sha256sum] = "293a0e7957ca2a24c6c2edbc87b237141a4b7ef19b35257edce65a026d7cbc0a"
 
 S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
@@ -17,24 +17,18 @@ do_compile[noexec] = "1"
 
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/imx/ele
-    install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-    if [ -e ${S}/${SECOEXT_FIRMWARE_NAME} ]; then
-        install -m 0644 ${S}/${SECOEXT_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele
-    fi
+    for fw in ${SECO_FIRMWARE_NAME} ${SECOEXT_FIRMWARE_NAME}; do
+        install -m 0644 ${S}/$fw ${D}${nonarch_base_libdir}/firmware/imx/ele
+    done
 }
 
 do_deploy () {
-    # Deploy the related firmware to be package by imx-boot
+    # Deploy the related firmware to be packaged by imx-boot
     install -m 0644 ${S}/${SECO_FIRMWARE_NAME}  ${DEPLOYDIR}
 }
 addtask deploy after do_install before do_build
 
-PACKAGES += "${PN}-ext"
-
-ALLOW_EMPTY:${PN}-ext = "1"
-
-FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
-FILES:${PN}-ext += "${nonarch_base_libdir}/firmware/imx/ele/${SECOEXT_FIRMWARE_NAME}"
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 RREPLACES:${PN} = "firmware-sentinel"
 RPROVIDES:${PN} = "firmware-sentinel"