From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 16 Feb 2022 17:53:44 +0000 (-0600)
Subject: optee-os: Upgrade 3.10.0.imx -> 3.15.0.imx
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=85f2b61f46ac5b8c5ac3c7e747c803891b8ec9b7;p=meta-freescale.git

optee-os: Upgrade 3.10.0.imx -> 3.15.0.imx

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b074ec01..471300ca 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -428,7 +428,7 @@ 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-os:mx8-nxp-bsp     ?= "3.15.0.imx"
 PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.10.0.imx"
 PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ?= "3.10.0.imx"
 
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
similarity index 97%
rename from recipes-security/optee-imx/optee-os_3.10.0.imx.bb
rename to recipes-security/optee-imx/optee-os_3.15.0.imx.bb
index 003aeba2..defcf63d 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
@@ -8,13 +8,12 @@ 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"