Merge pull request #1285 from Freescale/backport-1284-to-kirkstone

[Backport kirkstone] Optee: Update for lf-5.15.52_2.1.0

3 files changed, 29 insertions, 25 deletions

diff --git a/recipes-security/optee-imx/optee-client_3.17.0.imx.bb b/recipes-security/optee-imx/optee-client_3.17.0.imx.bb
index 53ee5bc4..6f0435fe 100644
--- a/recipes-security/optee-imx/optee-client_3.17.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_3.17.0.imx.bb
@@ -5,13 +5,11 @@ HOMEPAGE = "http://www.optee.org/"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
-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 \
-"
-
-SRCREV = "182874320395787a389e5b0f7df02b32f3c0a1b0"
+    git://github.com/nxp-imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH} \
+    file://tee-supplicant.service"
+SRCBRANCH = "lf-5.15.52_2.1.0"
+SRCREV = "9d8f1903bbea3a1e631c8d26ee51c37020569312"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
@@ -22,11 +20,9 @@ REQUIRED_MACHINE_FEATURES = "optee"
 
 SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
 
-OPTEE_ARCH ?= "arm32"
-OPTEE_ARCH:armv7a = "arm32"
-OPTEE_ARCH:aarch64 = "arm64"
-
-EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}"
+EXTRA_OEMAKE = " \
+        -C ${S} O=${B} \
+"
 
 do_install () {
         oe_runmake -C ${S} install
diff --git a/recipes-security/optee-imx/optee-os_3.17.0.imx.bb b/recipes-security/optee-imx/optee-os_3.17.0.imx.bb
index 93e0ff6e..b6452ef0 100644
--- a/recipes-security/optee-imx/optee-os_3.17.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_3.17.0.imx.bb
@@ -8,15 +8,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
 
 DEPENDS = "python3-cryptography-native python3-pyelftools-native u-boot-mkimage-native"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-5.15.32_2.0.0"
-SRCREV = "984996422c25c99ebfc5194c1bb393028605bb0c"
+SRC_URI = "git://github.com/nxp-imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-5.15.52_2.1.0"
+SRCREV = "9e86c8b6b102efa09ada451d0383ea3d11f8fad6"
 
 SRC_URI:append = " \
     file://0008-no-warn-rwx-segments.patch \
     "
 
 S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
 
 inherit deploy python3native autotools features_check
 
@@ -60,20 +61,29 @@ EXTRA_OEMAKE = " \
     -C ${S} O=${B} \
 "
 
-LDFLAGS = ""
+LDFLAGS[unexport] = "1"
 CFLAGS += "--sysroot=${STAGING_DIR_HOST}"
 CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}"
 
+do_configure[noexec] = "1"
+
+do_compile:arm () {
+    oe_runmake all uTee
+}
+
+do_compile:aarch64 () {
+    oe_runmake all
+}
+do_compile[cleandirs] = "${B}"
+
 do_deploy () {
     install -d ${DEPLOYDIR}
     cp ${B}/core/tee-raw.bin ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin
     ln -sf tee.${PLATFORM_FLAVOR}.bin ${DEPLOYDIR}/tee.bin
+}
 
-    if [ "${OPTEE_ARCH}" != "arm64" ]; then
-        IMX_LOAD_ADDR=`${TARGET_PREFIX}readelf -h ${B}/core/tee.elf | grep "Entry point address" | awk '{print $4}'`
-        uboot-mkimage -A arm -O linux -C none -a ${IMX_LOAD_ADDR} -e ${IMX_LOAD_ADDR} \
-            -d ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin ${DEPLOYDIR}/uTee-${OPTEE_BIN_EXT}
-    fi
+do_deploy:append:arm () {
+    cp ${B}/core/uTee ${DEPLOYDIR}/uTee-${OPTEE_BIN_EXT}
 }
 
 do_install () {
@@ -82,7 +92,6 @@ do_install () {
 
     # Install the TA devkit
     install -d ${D}${includedir}/optee/export-user_ta_${OPTEE_ARCH}/
-
     for f in ${B}/export-ta_${OPTEE_ARCH}/*; do
         cp -aR $f ${D}${includedir}/optee/export-user_ta_${OPTEE_ARCH}/
     done
@@ -96,7 +105,6 @@ do_install () {
 
 addtask deploy after do_compile before do_install
 
-
 FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/"
 FILES:${PN}-staticdev = "${includedir}/optee/"
 RDEPENDS:${PN}-dev += "${PN}-staticdev"
diff --git a/recipes-security/optee-imx/optee-test_3.17.0.imx.bb b/recipes-security/optee-imx/optee-test_3.17.0.imx.bb
index 54f92d72..da56eed7 100644
--- a/recipes-security/optee-imx/optee-test_3.17.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_3.17.0.imx.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 
 DEPENDS = "python3-cryptography-native optee-os optee-client openssl"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-5.15.32_2.0.0"
-SRCREV = "e064126a9769f168d1d0e178b74955e6648683b4"
+SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf-5.15.52_2.1.0"
+SRCREV = "41222c4b8df1adc0f0bdc737e5cb824becd25f63"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"