Merge pull request #985 from thochstein/optee

Optee: Upgrade 3.10.0.imx -> 3.15.0.imx

4 files changed, 51 insertions, 39 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b074ec014..fff3c56de 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -428,9 +428,9 @@ PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.107.imx"
 PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx"
 
 # Use i.MX optee Version
-PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ?= "3.10.0.imx"
-PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.10.0.imx"
-PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ?= "3.10.0.imx"
+PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ?= "3.15.0.imx"
+PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.15.0.imx"
+PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ?= "3.15.0.imx"
 
 #Use i.MX opencv Version for mx8
 PREFERRED_VERSION_opencv:mx8-nxp-bsp ?= "4.5.2.imx"
diff --git a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
index 2ad55a645..6e8f1e541 100644
--- a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
@@ -1,22 +1,24 @@
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2021 NXP
 
 SUMMARY = "OPTEE Client libs"
 HOMEPAGE = "http://www.optee.org/"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
-SRCBRANCH = "imx_5.4.70_2.3.0"
+SRCBRANCH = "lf-5.10.72_2.2.0"
 SRC_URI = " \
     git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH} \
     file://tee-supplicant.service \
 "
 
-SRCREV = "2a77cf88d956c34cb4a1c191bea6113e327f5fe0"
+SRCREV = "182874320395787a389e5b0f7df02b32f3c0a1b0"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
-inherit python3native systemd
+inherit python3native systemd features_check
+
+REQUIRED_MACHINE_FEATURES = "optee"
 
 SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
 
@@ -29,24 +31,20 @@ EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}"
 do_install () {
         oe_runmake -C ${S} install
 
-        install -D -p -m0644 ${B}/export/usr/lib/libteec.so.1.0 ${D}${libdir}/libteec.so.1.0
-        ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
-        ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
+        install -D -p -m0644 ${B}/export/usr/lib/libteec.so.1.0.0 ${D}${libdir}/libteec.so.1.0.0
+        ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1
+        ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so
+
+        install -D -p -m0644 ${B}/export/usr/lib/libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0.1.0
+        ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0
+        ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so
 
         install -D -p -m0755 ${B}/export/usr/sbin/tee-supplicant ${D}${bindir}/tee-supplicant
 
-        cp -a ${B}/export/usr/include ${D}/usr/
+        cp -a ${B}/export/usr/include ${D}${includedir}
 
         sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${WORKDIR}/tee-supplicant.service
         install -D -p -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service
 }
 
-PACKAGES += "tee-supplicant"
-FILES:${PN} += "${libdir}/* ${includedir}/*"
-FILES:tee-supplicant += "${bindir}/tee-supplicant"
-
-INSANE_SKIP:${PN} = "ldflags dev-elf"
-INSANE_SKIP:${PN}-dev = "ldflags dev-elf"
-INSANE_SKIP:tee-supplicant = "ldflags"
-
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-os_3.10.0.imx.bb b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb
index 003aeba2f..ffa3cc850 100644
--- a/recipes-security/optee-imx/optee-os_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2021 NXP
 
 SUMMARY = "OPTEE OS"
 DESCRIPTION = "OPTEE OS"
@@ -8,17 +8,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
 
 DEPENDS = "python3-pycryptodomex-native python3-pyelftools-native u-boot-mkimage-native"
 
-SRCBRANCH = "imx_5.4.70_2.3.0"
-
+SRCBRANCH = "lf-5.10.72_2.2.0"
 SRC_URI = "\
         git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \
 "
 
-SRCREV = "a991c90475bb1c715651e5fe27f7f32cbe61aef9"
+SRCREV = "c939619d64dea014ad1b8382356eee4d1cbfbb22"
 
 S = "${WORKDIR}/git"
 
-inherit deploy python3native autotools
+inherit deploy python3native autotools features_check
+
+REQUIRED_MACHINE_FEATURES = "optee"
 
 # The platform flavor corresponds to the Yocto machine without the leading 'i'.
 PLATFORM_FLAVOR                   = "${@d.getVar('MACHINE')[1:]}"
@@ -63,7 +64,7 @@ CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}"
 
 do_deploy () {
     install -d ${DEPLOYDIR}
-    ${TARGET_PREFIX}objcopy -O binary ${B}/core/tee.elf ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin
+    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
@@ -78,17 +79,23 @@ do_install () {
     install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
 
     # Install the TA devkit
-    install -d ${D}/usr/include/optee/export-user_ta_${OPTEE_ARCH}/
+    install -d ${D}${includedir}/optee/export-user_ta_${OPTEE_ARCH}/
 
     for f in ${B}/export-ta_${OPTEE_ARCH}/*; do
-        cp -aR $f ${D}/usr/include/optee/export-user_ta_${OPTEE_ARCH}/
+        cp -aR $f ${D}${includedir}/optee/export-user_ta_${OPTEE_ARCH}/
+    done
+
+    # Install embedded TAs
+    install -d ${D}${nonarch_base_libdir}/optee_armtz
+    find ${B}/ta -name '*.ta' | while read name; do
+        install -m 444 $name ${D}${nonarch_base_libdir}/optee_armtz/
     done
 }
 
 addtask deploy after do_compile before do_install
 
 
-FILES:${PN} = "${nonarch_base_libdir}/firmware/"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/"
 FILES:${PN}-staticdev = "/usr/include/optee/"
 RDEPENDS:${PN}-dev += "${PN}-staticdev"
 
diff --git a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
index 7039d0c4c..1d6de2432 100644
--- a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
@@ -1,23 +1,25 @@
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2021 NXP
 
 SUMMARY = "OPTEE test"
 HOMEPAGE = "http://www.optee.org/"
 
-LICENSE = "BSD-2-Clause"
+LICENSE = "BSD-2-Clause & GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 
 DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native optee-os optee-client openssl"
 
-SRCBRANCH = "imx_5.4.70_2.3.0"
+SRCBRANCH = "lf-5.10.72_2.2.0"
 
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
-SRCREV = "0c998f42a3fb87b9f2929955cf4b0116cc515091"
+SRCREV = "4d81b964a72e89a62d04187b3f055d8346b383c9"
 
-inherit python3native
+inherit python3native features_check
+
+REQUIRED_MACHINE_FEATURES = "optee"
 
 OPTEE_ARCH ?= "arm32"
 OPTEE_ARCH:armv7a = "arm32"
@@ -36,7 +38,6 @@ EXTRA_OEMAKE = " \
     CROSS_COMPILE_HOST=${HOST_PREFIX} \
     CROSS_COMPILE_TA=${HOST_PREFIX} \
     CROSS_COMPILE=${HOST_PREFIX} \
-    OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}/ \
     -C ${S} O=${B} \
 "
 
@@ -45,19 +46,25 @@ do_compile() {
     # Top level makefile doesn't seem to handle parallel make gracefully
     oe_runmake xtest
     oe_runmake ta
+    oe_runmake test_plugin
 }
 do_compile[cleandirs] = "${B}"
 
 do_install () {
-        install -d ${D}/usr/bin
-        install ${B}/xtest/xtest ${D}/usr/bin/
+        install -d ${D}${bindir}
+        install ${B}/xtest/xtest ${D}${bindir}
 
-        install -d ${D}/lib/optee_armtz
+        install -d ${D}${nonarch_base_libdir}/optee_armtz
         find ${B}/ta -name '*.ta' | while read name; do
-                install -m 444 $name ${D}/lib/optee_armtz/
+                install -m 444 $name ${D}${nonarch_base_libdir}/optee_armtz/
         done
+
+        install -d ${D}${libdir}/tee-supplicant/plugins/
+        install ${B}/supp_plugin/*plugin ${D}${libdir}/tee-supplicant/plugins/
 }
 
-FILES:${PN} = "/usr/bin/ /lib*/optee_armtz/"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/ ${libdir}/tee-supplicant/plugins/"
+
+RDEPENDS:${PN} = "optee-os"
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"