optee: Bump 4.6.0 -> 4.8.0

Signed-off-by: Zelan Zou <zelan.zou@nxp.com>

17 files changed, 40 insertions, 43 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 564557feb..e3309c462 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -611,10 +611,10 @@ PREFERRED_VERSION_vulkan-utility-libraries:imxvulkan ??= "1.3.275.0.imx"
 PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
 
 # Use i.MX optee Version
-PREFERRED_VERSION_optee-os:imx-nxp-bsp     ??= "4.6.0.imx"
-PREFERRED_VERSION_optee-client:imx-nxp-bsp ??= "4.6.0.imx"
-PREFERRED_VERSION_optee-test:imx-nxp-bsp   ??= "4.6.0.imx"
-PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp   ??= "4.6.0.imx"
+PREFERRED_VERSION_optee-os:imx-nxp-bsp     ??= "4.8.0.imx"
+PREFERRED_VERSION_optee-client:imx-nxp-bsp ??= "4.8.0.imx"
+PREFERRED_VERSION_optee-test:imx-nxp-bsp   ??= "4.8.0.imx"
+PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp   ??= "4.8.0.imx"
 
 # Use i.MX opencv Version
 PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
diff --git a/recipes-security/optee-imx/optee-client-fslc-imx.inc b/recipes-security/optee-imx/optee-client-fslc-imx.inc
index 1112a864d..06cc89a22 100644
--- a/recipes-security/optee-imx/optee-client-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-client-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-client-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See:https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 
 require optee-client-fslc.inc
 
@@ -10,8 +10,6 @@ SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protoco
 SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${SRCBRANCH} "
 OPTEE_CLIENT_SRC ?= "git://github.com/nxp-imx/imx-optee-client.git;protocol=https"
 
-SRC_URI += "file://0001-tee-supplicant-Fix-non-arch-service-unit-install-pat.patch"
-
 inherit pkgconfig
 
 EXTRA_OECMAKE += "-DCFG_TEE_CLIENT_LOAD_PATH=${nonarch_base_libdir}"
diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc
index 70a25fe6c..ab7c8bc69 100644
--- a/recipes-security/optee-imx/optee-client-fslc.inc
+++ b/recipes-security/optee-imx/optee-client-fslc.inc
@@ -1,5 +1,5 @@
 # Copied from meta-arm/recipes-security/optee/optee-client.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L32
 
 SUMMARY = "OP-TEE Client API"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World Client side of the TEE"
diff --git a/recipes-security/optee-imx/optee-client_4.6.0.imx.bb b/recipes-security/optee-imx/optee-client_4.6.0.imx.bb
deleted file mode 100644
index b5a185da1..000000000
--- a/recipes-security/optee-imx/optee-client_4.6.0.imx.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require optee-client-fslc-imx.inc
-
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
diff --git a/recipes-security/optee-imx/optee-client_4.8.0.imx.bb b/recipes-security/optee-imx/optee-client_4.8.0.imx.bb
new file mode 100644
index 000000000..cb3235a9a
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client_4.8.0.imx.bb
@@ -0,0 +1,4 @@
+require optee-client-fslc-imx.inc
+
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "ad79099ca6b642f2bb69739f020ea50698ea0744"
diff --git a/recipes-security/optee-imx/optee-fslc.inc b/recipes-security/optee-imx/optee-fslc.inc
index 599dda522..dadbfa802 100644
--- a/recipes-security/optee-imx/optee-fslc.inc
+++ b/recipes-security/optee-imx/optee-fslc.inc
@@ -1,5 +1,5 @@
 # Copied from meta-arm/recipes-security/optee/optee.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L32
 
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 
@@ -19,16 +19,13 @@ OPTEE_ARCH:arm = "arm32"
 OPTEE_ARCH:aarch64 = "arm64"
 OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
 
-OPTEE_TOOLCHAIN = "${@d.getVar('TOOLCHAIN') or 'gcc'}"
-OPTEE_COMPILER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "${OPTEE_TOOLCHAIN}", "gcc", d)}"
-
 # Set here but not passed to EXTRA_OEMAKE by default as that breaks
 # the optee-os build
 TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta"
 
+# Assume that our TOOLCHAIN matches OP-TEE's COMPILER
 EXTRA_OEMAKE += "V=1 \
-                 LIBGCC_LOCATE_CFLAGS='${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}' \
-                 COMPILER=${OPTEE_COMPILER} \
+                 COMPILER=${TOOLCHAIN} \
                  OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                  TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
                 "
diff --git a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
index ffd217099..16ed8cea7 100644
--- a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-os-common-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-os-fslc.inc
 
 DEPENDS:append:arm = "u-boot-mkimage-native"
@@ -8,7 +8,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
 
 SRC_URI:remove = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
 SRC_URI:prepend = "${OPTEE_OS_SRC};branch=${SRCBRANCH} "
-SRC_URI:append = " file://0007-allow-setting-sysroot-for-clang.patch"
 SRC_URI:remove = "file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
                   file://0002-optee-enable-clang-support.patch \
                   file://0003-core-link-add-no-warn-rwx-segments.patch"
diff --git a/recipes-security/optee-imx/optee-os-fslc-imx.inc b/recipes-security/optee-imx/optee-os-fslc-imx.inc
index f46f666ee..ecd88b41d 100644
--- a/recipes-security/optee-imx/optee-os-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-os-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 
 require optee-os-common-fslc-imx.inc
 
diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index 4df1617d1..febdd2c73 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -1,5 +1,5 @@
 # Copied from meta-arm/recipes-security/optee/optee-os.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L32
 
 SUMMARY = "OP-TEE Trusted OS"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Trusted side of the TEE"
@@ -15,7 +15,7 @@ CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 
 DEPENDS = "python3-pyelftools-native python3-cryptography-native"
 
-DEPENDS:append:toolchain-clang = " compiler-rt"
+DEPENDS:append:toolchain-clang = " lld-native compiler-rt"
 
 SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
 
@@ -33,15 +33,14 @@ EXTRA_OEMAKE += " \
 EXTRA_OEMAKE += " HOST_PREFIX=${HOST_PREFIX}"
 EXTRA_OEMAKE += " CROSS_COMPILE64=${HOST_PREFIX}"
 
+# Enable BTI in optee
+EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}"
+
 LDFLAGS[unexport] = "1"
 CPPFLAGS[unexport] = "1"
 AS[unexport] = "1"
 LD[unexport] = "1"
 
-do_compile:prepend() {
-        PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name)
-}
-
 do_compile() {
     oe_runmake -C ${S} all
 }
diff --git a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
index 0b02c6908..68918414c 100644
--- a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-os-tadevkit-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 
 require optee-os-common-fslc-imx.inc
 
@@ -22,3 +22,6 @@ do_deploy() {
 }
 
 FILES:${PN} = "${includedir}/optee/"
+
+# Build paths are currently embedded
+INSANE_SKIP:${PN}-dev += "buildpaths"
diff --git a/recipes-security/optee-imx/optee-os-tadevkit_4.6.0.imx.bb b/recipes-security/optee-imx/optee-os-tadevkit_4.6.0.imx.bb
deleted file mode 100644
index 92bdf00e7..000000000
--- a/recipes-security/optee-imx/optee-os-tadevkit_4.6.0.imx.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require optee-os-tadevkit-fslc-imx.inc
-
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "87964807d80baf1dcfd89cafc66de34a1cf16bf3"
diff --git a/recipes-security/optee-imx/optee-os-tadevkit_4.8.0.imx.bb b/recipes-security/optee-imx/optee-os-tadevkit_4.8.0.imx.bb
new file mode 100644
index 000000000..d62d7d647
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os-tadevkit_4.8.0.imx.bb
@@ -0,0 +1,4 @@
+require optee-os-tadevkit-fslc-imx.inc
+
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "e7ed997213779e3d1b7417461c5b4847d3230db9"
diff --git a/recipes-security/optee-imx/optee-os_4.6.0.imx.bb b/recipes-security/optee-imx/optee-os_4.6.0.imx.bb
deleted file mode 100644
index ed2557bcb..000000000
--- a/recipes-security/optee-imx/optee-os_4.6.0.imx.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2017-2024 NXP
-
-require optee-os-fslc-imx.inc
-
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "87964807d80baf1dcfd89cafc66de34a1cf16bf3"
diff --git a/recipes-security/optee-imx/optee-os_4.8.0.imx.bb b/recipes-security/optee-imx/optee-os_4.8.0.imx.bb
new file mode 100644
index 000000000..b73b4c757
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os_4.8.0.imx.bb
@@ -0,0 +1,6 @@
+# Copyright 2017-2024,2026 NXP
+
+require optee-os-fslc-imx.inc
+
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "e7ed997213779e3d1b7417461c5b4847d3230db9"
diff --git a/recipes-security/optee-imx/optee-test-fslc-imx.inc b/recipes-security/optee-imx/optee-test-fslc-imx.inc
index b4bb6031b..2c0d278e3 100644
--- a/recipes-security/optee-imx/optee-test-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-test-fslc-imx.inc
@@ -1,5 +1,5 @@
 # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-test-imx.inc.
-# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-test-fslc.inc
 
 DEPENDS += "openssl"
diff --git a/recipes-security/optee-imx/optee-test-fslc.inc b/recipes-security/optee-imx/optee-test-fslc.inc
index 46d57ac41..a5183b7e1 100644
--- a/recipes-security/optee-imx/optee-test-fslc.inc
+++ b/recipes-security/optee-imx/optee-test-fslc.inc
@@ -1,5 +1,5 @@
 # Copied from meta-arm/recipes-security/optee/optee-test.inc.
-# See:https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30
+# See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L32
 
 SUMMARY = "OP-TEE sanity testsuite"
 DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
@@ -12,6 +12,7 @@ inherit deploy
 require optee-fslc.inc
 
 DEPENDS = "optee-client optee-os-tadevkit python3-cryptography-native openssl"
+DEPENDS:append:toolchain-clang = " lld-native"
 
 SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
            file://run-ptest \
diff --git a/recipes-security/optee-imx/optee-test_4.6.0.imx.bb b/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
index 78e933486..2f2b40e09 100644
--- a/recipes-security/optee-imx/optee-test_4.6.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 NXP
+# Copyright 2017-2024,2026 NXP
 
 require optee-test-fslc-imx.inc
 
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
                     file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d"
 
 
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "010f088f05b5ebf392c6e235d6e53d391755722f" 
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "3383a744a5997fdb3457b3cbe95aea3ce27879b3"