optee-os: Upgrade to lf-6.1.36-2.1.0 (3.21)

Upgrade optee-os to be aligned with NXP BSP LF6.1.36_2.1.0.

Also add support of individual building flags for a new machine
imx8mq-lpddr4-wevk.

Relevant changes:
- 4e3228190 LFOPTEE-268 drivers: ele: update generate key command parameters
- c1cdc8a65 LFOPTEE-268 drivers: ele: update key store open command parameters
- 9dc96cbec LFOPTEE-268 drivers: ele: add SAB init command
- 72ae0b0d5 LFOPTEE-268 drivers: ele: update session open command parameters
- 1d7fd776b drivers: caam: fix size of CMAC update data
- 4ad137591 core: fix race in mobj_reg_shm_dec_map()
- 9efc52269 LFOPTEE-254 drivers: ele: return error when response status does not succeed
- 9c03dee67 LFOPTEE-252 drivers: ele: remove non secure MU mapping
- 6738e2faa LFOPTEE-241 drivers: ele: add ELE status code and debug traces
- 308c6ee32 LFOPTEE-244 drivers: ele: allocate data in heap for HUK derivation

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>

2 files changed, 9 insertions, 2 deletions

diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index 19ca7b3c..b91a5531 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -27,6 +27,13 @@ EXTRA_OEMAKE += " \
     CFG_TEE_CORE_LOG_LEVEL=0 \
 "
 
+EXTRA_OEMAKE:append:imx8mq-lpddr4-wevk = " \
+    CFG_CORE_LARGE_PHYS_ADDR=y \
+    CFG_CORE_ARM64_PA_BITS=36 \
+    CFG_DDR_SIZE=0x100000000 \
+    CFG_TZDRAM_START=0xfe000000 \
+"
+
 LDFLAGS[unexport] = "1"
 CPPFLAGS[unexport] = "1"
 AS[unexport] = "1"
diff --git a/recipes-security/optee-imx/optee-os_3.21.0.imx.bb b/recipes-security/optee-imx/optee-os_3.21.0.imx.bb
index f158441f..89788370 100644
--- a/recipes-security/optee-imx/optee-os_3.21.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_3.21.0.imx.bb
@@ -8,5 +8,5 @@ SRC_URI += " \
     file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \
     file://0004-core-link-add-no-warn-rwx-segments.patch \
 "
-SRCBRANCH = "lf-6.1.22_2.0.0"
-SRCREV = "1962aec9581760803b1485d455cd62cb11c14870"
+SRCBRANCH = "lf-6.1.36_2.1.0"
+SRCREV = "4e32281904b15af9ddbdf00f73e1c08eae21c695"