From f192819a77ebb2854bd197214188766261238ed4 Mon Sep 17 00:00:00 2001
From: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Date: Sun, 21 Apr 2024 21:03:44 +0300
Subject: [PATCH 1/2] firmware-nxp-wifi: Update to the version of NXP
 6.6.3-1.0.0 release

Relevant commits:
- 2afa15e FwImage: update firmware to mxm6x17437.p3
- d962eb9 FwImage: update firmware to mxm6x17437
- c03add9 LICENSE.txt: update Software License to v53

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
 recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
index 8dc7ae64a..d28b23821 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
@@ -7,11 +7,11 @@ should be preferred."
 
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f"
 
-SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.1.55_2.2.0"
-SRCREV = "7be5a936ce8677962dd7b41c6c9f41dd14350bec"
+SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCREV = "2afa15e77f0b58eade42b4f59c9215339efcca66"
 
 S = "${WORKDIR}/git"
 

From 735b303cdfda868db0061ce801877715a9c9480d Mon Sep 17 00:00:00 2001
From: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Date: Sun, 21 Apr 2024 21:21:47 +0300
Subject: [PATCH 2/2] firmware-ele-imx: Update to 0.1.1 aligned with
 LF6.6.3-1.0.0

Update the recipe to be aligned with the NXP BSP LF6.6.3-1.0.0.

Add installing of a second part of ELE to rootfs.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
 conf/machine/include/imx-base.inc                  |  4 ++++
 ...-ele-imx_0.1.0.bb => firmware-ele-imx_0.1.1.bb} | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 rename recipes-bsp/firmware-imx/{firmware-ele-imx_0.1.0.bb => firmware-ele-imx_0.1.1.bb} (63%)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index c1243c7fa..78c1e762e 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -486,6 +486,10 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \
 "
 
+# ELE extra Firmware
+SECOEXT_FIRMWARE_NAME ?= "UNDEFINED"
+SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img"
+
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN                ?= ""
 MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl-nxp-bsp  ?= "gstreamer1.0-plugins-imx-meta"
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb
similarity index 63%
rename from recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb
rename to recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb
index 83c865c25..70252c01c 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_0.1.1.bb
@@ -3,19 +3,22 @@ SUMMARY = "NXP i.MX ELE firmware"
 DESCRIPTION = "EdgeLock Enclave firmware for i.MX series SoCs"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
 
 inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "7532c2e356574c1c9255c01169d38427"
-SRC_URI[sha256sum] = "4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca"
+SRC_URI[md5sum] = "f4df2005ec4555e9f177acbf62a7a969"
+SRC_URI[sha256sum] = "3f69d6cf6ea448c5c2f87b6acdad1c5c2318616d246cc5047a523f2543fee408"
 
 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
 }
 
 do_deploy () {
@@ -24,7 +27,12 @@ do_deploy () {
 }
 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}"
 
 RREPLACES:${PN} = "firmware-sentinel"
 RPROVIDES:${PN} = "firmware-sentinel"