From e472f25e61564b20922eb41b0fc6bf8c37f9d7cc Mon Sep 17 00:00:00 2001
From: Zelan Zou <zelan.zou@nxp.com>
Date: Tue, 17 Mar 2026 11:40:44 +0800
Subject: imx-secure-enclave: Update to lf-6.18.2-1.0.0

Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
---
 .../imx-secure-enclave-prime_git.bb                | 13 ++++++++++
 .../imx-secure-enclave-seco_git.bb                 | 20 +++++++++++++++
 .../imx-secure-enclave/imx-secure-enclave.inc      | 29 ++++++++++++++++++++++
 .../imx-secure-enclave/imx-secure-enclave_git.bb   | 29 +++++++---------------
 4 files changed, 71 insertions(+), 20 deletions(-)
 create mode 100644 recipes-bsp/imx-secure-enclave/imx-secure-enclave-prime_git.bb
 create mode 100644 recipes-bsp/imx-secure-enclave/imx-secure-enclave-seco_git.bb
 create mode 100644 recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc

diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave-prime_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave-prime_git.bb
new file mode 100644
index 000000000..1bd72d118
--- /dev/null
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave-prime_git.bb
@@ -0,0 +1,13 @@
+require imx-secure-enclave.inc
+
+SUMMARY += "PRIME"
+DESCRIPTION += "PRIME"
+
+PLAT = "prime"
+
+do_install:append() {
+    # Remove common content that is to be installed by imx-secure-enclave
+    rm ${D}${datadir}/se/README
+}
+
+COMPATIBLE_MACHINE = "(mx943-nxp-bsp|mx952-nxp-bsp)"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave-seco_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave-seco_git.bb
new file mode 100644
index 000000000..803cbeffe
--- /dev/null
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave-seco_git.bb
@@ -0,0 +1,20 @@
+require imx-secure-enclave.inc
+
+SUMMARY += "SECO"
+DESCRIPTION += "SECO"
+
+PLAT = "seco"
+
+EXTRA_OEMAKE:append:mx8x-nxp-bsp = " COMPATIBLE_MACHINE=mx8dxl-nxp-bsp"
+
+do_install:append:mx9-nxp-bsp() {
+    # Remove common content that is to be installed by imx-secure-enclave
+    for i in common hsm nvm.h; do
+        rm -rf ${D}${includedir}/$i
+    done
+    rm ${D}${datadir}/se/README
+    rm ${D}${bindir}/nvmd_conf_setup.sh
+    rm ${D}${bindir}/se_tools
+}
+
+COMPATIBLE_MACHINE = "(mx8x-nxp-bsp|mx943-nxp-bsp|mx95-nxp-bsp|mx952-nxp-bsp)"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
new file mode 100644
index 000000000..bb045b6fb
--- /dev/null
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
@@ -0,0 +1,29 @@
+# Copyright 2021-2025 NXP
+
+SUMMARY = "NXP i.MX SECURE ENCLAVE library"
+DESCRIPTION = "NXP IMX SECURE ENCLAVE library"
+SECTION = "base"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
+
+DEPENDS = " mbedtls openssl"
+
+SRC_URI = "${SECURE_ENCLAVE_LIB_SRC};branch=${SRCBRANCH}"
+SECURE_ENCLAVE_LIB_SRC ?= "git://github.com/NXP/imx-secure-enclave.git;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "24fdfb728fff1644878f5ab4a5557decf0769959"
+
+PLAT ?= "UNDEFINED"
+
+EXTRA_OEMAKE = "PLAT=${PLAT} OPENSSL_PATH=${STAGING_INCDIR} MBEDTLS_PATH=${STAGING_DIR_HOST}${datadir}/mbedtls-source"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_install() {
+	oe_runmake -C ${S} DESTDIR=${D} install_tests
+}
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
+FILES:${PN} += "${datadir}/se"
+RDEPENDS:${PN}:append = " bash"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
index 525824f79..647a9d768 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -1,29 +1,18 @@
-SUMMARY = "NXP i.MX Secure Enclave Userspace Library"
-DESCRIPTION = "NXP i.MX Secure Enclave Userspace Library"
-SECTION = "base"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
-
-DEPENDS = "openssl"
+require imx-secure-enclave.inc
 
 inherit systemd
 
-SRC_URI = "git://github.com/NXP/imx-secure-enclave.git;protocol=https;branch=lf-6.6.52_2.2.0"
-SRCREV = "dffbb844e86f4a49058ffbb40548474059969c27"
-
-PV = "lf-6.6.52_2.2.0"
+SYSTEMD_AUTO_ENABLE = "disable"
+SYSTEMD_SERVICE:${PN} = "nvm_daemon.service"
 
-EXTRA_OEMAKE += "PLAT=ele"
+PLAT = "ele"
 
-TARGET_CC_ARCH += "${LDFLAGS}"
+PACKAGES =+ "${PN}-crrm"
 
-do_install () {
-    oe_runmake DESTDIR=${D} install
-    rm -rf ${D}/usr/share
-}
+RDEPENDS:${PN} = "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${PN}-crrm', '', d)}"
 
-SYSTEMD_AUTO_ENABLE = "disable"
-SYSTEMD_SERVICE:${PN} = "nvm_daemon.service"
+FILES:${PN}-crrm = " \
+    ${bindir}/ele_crrm_test \
+    ${libdir}/lib*crrm${SOLIBS}"
 
 COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"
-- 
cgit v1.2.3-54-g00ecf