From 767e567cfb0152311ee8ab90c817e37763fde303 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 16 Feb 2022 11:54:14 -0600
Subject: optee-client: Upgrade 3.10.0.imx -> 3.15.0.imx

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 conf/machine/include/imx-base.inc                  |  2 +-
 .../optee-imx/optee-client_3.10.0.imx.bb           | 52 --------------------
 .../optee-imx/optee-client_3.15.0.imx.bb           | 56 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 53 deletions(-)
 delete mode 100644 recipes-security/optee-imx/optee-client_3.10.0.imx.bb
 create mode 100644 recipes-security/optee-imx/optee-client_3.15.0.imx.bb

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 471300ca..aa59daba 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -429,7 +429,7 @@ PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx"
 
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ?= "3.15.0.imx"
-PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.10.0.imx"
+PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.15.0.imx"
 PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ?= "3.10.0.imx"
 
 #Use i.MX opencv Version for mx8
diff --git a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb b/recipes-security/optee-imx/optee-client_3.10.0.imx.bb
deleted file mode 100644
index 2ad55a64..00000000
--- a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2017-2020 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"
-SRC_URI = " \
-    git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH} \
-    file://tee-supplicant.service \
-"
-
-SRCREV = "2a77cf88d956c34cb4a1c191bea6113e327f5fe0"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-inherit python3native systemd
-
-SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
-
-OPTEE_ARCH ?= "arm32"
-OPTEE_ARCH:armv7a = "arm32"
-OPTEE_ARCH:aarch64 = "arm64"
-
-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 -m0755 ${B}/export/usr/sbin/tee-supplicant ${D}${bindir}/tee-supplicant
-
-	cp -a ${B}/export/usr/include ${D}/usr/
-
-	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-client_3.15.0.imx.bb b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
new file mode 100644
index 00000000..dcfee307
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
@@ -0,0 +1,56 @@
+# Copyright (C) 2017-2020 NXP
+
+SUMMARY = "OPTEE Client libs"
+HOMEPAGE = "http://www.optee.org/"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
+
+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 = "182874320395787a389e5b0f7df02b32f3c0a1b0"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+inherit python3native systemd
+
+SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
+
+OPTEE_ARCH ?= "arm32"
+OPTEE_ARCH:armv7a = "arm32"
+OPTEE_ARCH:aarch64 = "arm64"
+
+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.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}${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)"
-- 
cgit v1.2.3-54-g00ecf