From 6708ec5ed85d3ea80ec37b3125d179a9c909dfce Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 30 Nov 2023 16:05:04 +0200 Subject: 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 --- recipes-security/optee-imx/optee-os-fslc.inc | 7 +++++++ recipes-security/optee-imx/optee-os_3.21.0.imx.bb | 4 ++-- 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 19ca7b3ce..b91a55311 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 f158441fd..89788370f 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" -- cgit v1.2.3-54-g00ecf From b2910953234597227ee33837364d438d74aeaee7 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 30 Nov 2023 16:22:15 +0200 Subject: optee-client: Upgrade to lf-6.1.36-2.1.0 (3.21) Change a branch of optee-client to be aligned with NXP BSP LF6.1.36_2.1.0. There are no real changes in the code and HEAD stays the same. Signed-off-by: Oleksandr Suvorov --- recipes-security/optee-imx/optee-client_3.21.0.imx.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-security/optee-imx/optee-client_3.21.0.imx.bb b/recipes-security/optee-imx/optee-client_3.21.0.imx.bb index 5d5089118..3860cb6c3 100644 --- a/recipes-security/optee-imx/optee-client_3.21.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.21.0.imx.bb @@ -1,6 +1,6 @@ require optee-client-fslc-imx.inc -SRCBRANCH = "lf-6.1.22_2.0.0" +SRCBRANCH = "lf-6.1.36_2.1.0" SRCREV = "8533e0e6329840ee96cf81b6453f257204227e6c" DEPENDS += "util-linux" -- cgit v1.2.3-54-g00ecf From 2b302818ed547bad2dacb3c5d65732a645856695 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 30 Nov 2023 16:26:36 +0200 Subject: optee-test: Upgrade to lf-6.1.36-2.1.0 (3.21) Upgrade optee-test to be aligned with NXP BSP LF6.1.36_2.1.0. Relevant changes: - e0ebd51 regression_4000: add CMAC test with more than 1KB input buffer size - 7559c09 xtest: fix compilation error with WITH_OPENSSL=n Signed-off-by: Oleksandr Suvorov --- recipes-security/optee-imx/optee-test_3.21.0.imx.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-security/optee-imx/optee-test_3.21.0.imx.bb b/recipes-security/optee-imx/optee-test_3.21.0.imx.bb index 56ed2aa20..159c74ce9 100644 --- a/recipes-security/optee-imx/optee-test_3.21.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.21.0.imx.bb @@ -4,7 +4,7 @@ require optee-test-fslc.inc SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "lf-6.1.22_2.0.0" -SRCREV = "c2c9f922044d2c8a7ab384812bb124c6da2b7888" +SRCBRANCH = "lf-6.1.36_2.1.0" +SRCREV = "e0ebd5193070e0215b5389da191bc33f4f478222" COMPATIBLE_MACHINE = "(imx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf