Merge pull request #1086 from Freescale/backport-1085-to-kirkstone

[Backport kirkstone] Optee imx

4 files changed, 12 insertions, 45 deletions

diff --git a/recipes-security/optee-imx/optee-client_3.15.0.imx.bb b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
index 6e8f1e54..53ee5bc4 100644
--- a/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.optee.org/"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
-SRCBRANCH = "lf-5.10.72_2.2.0"
+SRCBRANCH = "lf-5.15.5_1.0.0"
 SRC_URI = " \
     git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH} \
     file://tee-supplicant.service \
diff --git a/recipes-security/optee-imx/optee-os/0001-arm-imx-fix-RPMB-header-include.patch b/recipes-security/optee-imx/optee-os/0001-arm-imx-fix-RPMB-header-include.patch
deleted file mode 100644
index 469802e8..00000000
--- a/recipes-security/optee-imx/optee-os/0001-arm-imx-fix-RPMB-header-include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d965393256e32a93dae41765543523598fca5d00 Mon Sep 17 00:00:00 2001
-From: Clement Faure <clement.faure@nxp.com>
-Date: Mon, 7 Mar 2022 10:21:04 -0600
-Subject: [PATCH] arm: imx: fix RPMB header include
-
-Replace <drivers/imx_snvs.h> by <drivers/nxp_snvs.h>
-
-Upstream-Status: Backport from NXP 5.15.5-1.0.0
-Signed-off-by: Clement Faure <clement.faure@nxp.com>
----
- core/arch/arm/plat-imx/imx_rpmb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/arch/arm/plat-imx/imx_rpmb.c b/core/arch/arm/plat-imx/imx_rpmb.c
-index 9f0eb384d..2dd41105e 100644
---- a/core/arch/arm/plat-imx/imx_rpmb.c
-+++ b/core/arch/arm/plat-imx/imx_rpmb.c
-@@ -2,7 +2,7 @@
- /*
-  * Copyright 2020 Pengutronix, Rouven Czerwinski <entwicklung@pengutronix.de>
-  */
--#include <drivers/imx_snvs.h>
-+#include <drivers/nxp_snvs.h>
- #include <imx.h>
- #include <tee/tee_fs.h>
- 
--- 
-2.17.1
-
diff --git a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb
index 3fca3dbf..15244c45 100644
--- a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb
@@ -8,13 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
 
 DEPENDS = "python3-pycryptodomex-native python3-pyelftools-native u-boot-mkimage-native"
 
-SRCBRANCH = "lf-5.10.72_2.2.0"
-SRC_URI = "\
-        git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \
-        file://0001-arm-imx-fix-RPMB-header-include.patch \
-"
+SRCBRANCH = "lf-5.15.5_1.0.0"
+SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH}"
 
-SRCREV = "c939619d64dea014ad1b8382356eee4d1cbfbb22"
+SRCREV = "807629a0889ad5e888f1fd187932ab7f701ddf8c"
 
 S = "${WORKDIR}/git"
 
@@ -34,11 +31,14 @@ PLATFORM_FLAVOR:imx6ulz           = "mx6ulzevk"
 PLATFORM_FLAVOR:mx8mq-nxp-bsp     = "mx8mqevk"
 PLATFORM_FLAVOR:mx8mm-nxp-bsp     = "mx8mmevk"
 PLATFORM_FLAVOR:mx8mn-nxp-bsp     = "mx8mnevk"
+PLATFORM_FLAVOR:mx8mnul-nxp-bsp   = "mx8mnevk"
 PLATFORM_FLAVOR:mx8mp-nxp-bsp     = "mx8mpevk"
+PLATFORM_FLAVOR:mx8mpul-nxp-bsp   = "mx8mpevk"
 PLATFORM_FLAVOR:mx8qm-nxp-bsp     = "mx8qmmek"
 PLATFORM_FLAVOR:mx8qxp-nxp-bsp    = "mx8qxpmek"
 PLATFORM_FLAVOR:mx8dx-nxp-bsp     = "mx8dxmek"
 PLATFORM_FLAVOR:mx8dxl-nxp-bsp    = "mx8dxlevk"
+PLATFORM_FLAVOR:mx8ulp-nxp-bsp    = "mx8ulpevk"
 
 OPTEE_ARCH ?= "arm32"
 OPTEE_ARCH:armv7a = "arm32"
@@ -97,7 +97,7 @@ addtask deploy after do_compile before do_install
 
 
 FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/"
-FILES:${PN}-staticdev = "/usr/include/optee/"
+FILES:${PN}-staticdev = "${includedir}/optee/"
 RDEPENDS:${PN}-dev += "${PN}-staticdev"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
index 1d6de243..a44454a7 100644
--- a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 
 DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native optee-os optee-client openssl"
 
-SRCBRANCH = "lf-5.10.72_2.2.0"
+SRCBRANCH = "lf-5.15.5_1.0.0"
 
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
-SRCREV = "4d81b964a72e89a62d04187b3f055d8346b383c9"
+SRCREV = "e9d8bf6ee121d6686e6e409c727caee76496bb86"
 
 inherit python3native features_check
 
@@ -34,7 +34,7 @@ CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}"
 EXTRA_OEMAKE = " \
     TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
     ARCH=${OPTEE_ARCH} \
-    OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}/usr \
+    OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${exec_prefix} \
     CROSS_COMPILE_HOST=${HOST_PREFIX} \
     CROSS_COMPILE_TA=${HOST_PREFIX} \
     CROSS_COMPILE=${HOST_PREFIX} \
@@ -42,11 +42,7 @@ EXTRA_OEMAKE = " \
 "
 
 do_compile() {
-    cd ${S}
-    # Top level makefile doesn't seem to handle parallel make gracefully
-    oe_runmake xtest
-    oe_runmake ta
-    oe_runmake test_plugin
+    oe_runmake all
 }
 do_compile[cleandirs] = "${B}"