From e2bef5cbf00ae9d704ee5e7d5fa5ad94e818319b Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Mon, 1 May 2023 19:02:17 +0300 Subject: optee: switch to branch lf-6.1.1_1.0.0 Switch optee-os, optee-client and optee-test to the branch lf-6.1.1_1.0.0 used in NXP BSP L6.1.1-1.0.0. Relevant changes: optee-os: - ad4e8389b core: crypto: fix memory leak in Ed25519 support - f9143cad9 SCR: add imx-optee-os - c29c0bcb7 LF-8234 core: imx: pm: remove enable/disable of LDP 1P0D - a0359fd6d LFOPTEE-211 core: update tee_entry_is_sdp_cached - 69afc6774 LFOPTEE-188 core: imx: use register_ddr() to register dynamic shared memory - e66300ff9 LF-7525 drivers: dcp: do not modify DCP node status in the DTB - c02d09dea core: mm: fix error flushing unused pgt's - 3c13f920e libutils: util.h: fix the ROUNDUP_OVERFLOW() macro - ad85772e0 LFOPTEE-203 drivers: ele: align HUK output buffer optee-client: - 01231b7 SCR: add imx-optee-client - 895a924 teeacl: fix include path optee-test: - 7c314e6 SCR: add imx-optee-test Signed-off-by: Oleksandr Suvorov (cherry picked from commit 9a2a39a9fa9d6815e8bf51b18b2d1e545cc26241) --- recipes-security/optee-imx/optee-client_3.19.0.imx.bb | 4 ++-- recipes-security/optee-imx/optee-os_3.19.0.imx.bb | 4 ++-- recipes-security/optee-imx/optee-test_3.19.0.imx.bb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-security/optee-imx/optee-client_3.19.0.imx.bb b/recipes-security/optee-imx/optee-client_3.19.0.imx.bb index 40675e35..102b3ce9 100644 --- a/recipes-security/optee-imx/optee-client_3.19.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.19.0.imx.bb @@ -1,4 +1,4 @@ require optee-client-fslc-imx.inc -SRCBRANCH = "lf-5.15.71_2.2.0" -SRCREV = "644022f8970c832a40be00747fcec70c7b5d488c" +SRCBRANCH = "lf-6.1.1_1.0.0" +SRCREV = "01231b7a7ce03cdf9d3f48e7baa0bce17aac28f7" diff --git a/recipes-security/optee-imx/optee-os_3.19.0.imx.bb b/recipes-security/optee-imx/optee-os_3.19.0.imx.bb index 9059b538..aec204c6 100644 --- a/recipes-security/optee-imx/optee-os_3.19.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.19.0.imx.bb @@ -6,5 +6,5 @@ SRC_URI += "file://0001-core-Define-section-attributes-for-clang.patch \ file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ file://0007-allow-setting-sysroot-for-clang.patch \ file://0010-add-note-GNU-stack-section.patch" -SRCBRANCH = "lf-5.15.71_2.2.0" -SRCREV = "00919403f040fad4f8603e605932281ff8451b1d" +SRCBRANCH = "lf-6.1.1_1.0.0" +SRCREV = "ad4e8389bb2c38efe39853925eec571ac778c575" diff --git a/recipes-security/optee-imx/optee-test_3.19.0.imx.bb b/recipes-security/optee-imx/optee-test_3.19.0.imx.bb index 9cc21efa..1ef4cad5 100644 --- a/recipes-security/optee-imx/optee-test_3.19.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.19.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-5.15.71_2.2.0" -SRCREV = "5c1dbb531b304f7ae100958f6261b6cefea49b62" +SRCBRANCH = "lf-6.1.1_1.0.0" +SRCREV = "7c314e6a0cec0ba19246eb4f1959859d7a6536d6" COMPATIBLE_MACHINE = "(imx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf