Update optee_os, optee_client, optee_examples and optee_test to the newer 4.9.0 tag.
Signed-off-by: Manorit Chawdhry <[email protected]> --- v2: Fix the commit sha and send only for scarthgap --- .../optee/optee-client-ti-version.inc | 4 +- .../optee/optee-examples-ti-version.inc | 4 +- .../optee/optee-os-ti-overrides.inc | 9 ---- .../optee/optee-os-ti-version.inc | 4 +- ...Open-TRNG-firewall-for-TIFS-on-all-k.patch | 45 ------------------- .../optee/optee-test-ti-version.inc | 4 +- 6 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 meta-ti-bsp/recipes-security/optee/optee-os/0001-plat-k3-drivers-Open-TRNG-firewall-for-TIFS-on-all-k.patch diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc index 289ca5b500cd..68b6b262a448 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc @@ -1,2 +1,2 @@ -PV = "4.7.0+git" -SRCREV = "23c112a6f05cc5e39bd4aaf52ad515cad532237d" +PV = "4.9.0+git" +SRCREV = "9f5e90918093c1d1cd264d8149081b64ab7ba672" diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc index 91dd5e60ca67..6ec2a83db8ce 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc @@ -1,2 +1,2 @@ -PV = "4.7.0+git" -SRCREV = "14321a0607db16099d158478b21a2b2e37b3a935" +PV = "4.9.0+git" +SRCREV = "934c7edb74a26e90f68024cf441073528444177f" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc index d636ae006216..b5cc9ddb7d95 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc @@ -78,12 +78,3 @@ RDEPENDS:${PN} += "${PN}-ta" # This is needed for bl32.elf INSANE_SKIP:${PN}:append:k3 = " textrel" - -# LPM support patch for Jacinto platforms (J7200, J742S2, J784S4) -OPTEE_JACINTO_LPM_PATCHES = " \ - file://0001-plat-k3-drivers-Open-TRNG-firewall-for-TIFS-on-all-k.patch \ -" - -SRC_URI:append:j7200 = " ${OPTEE_JACINTO_LPM_PATCHES}" -SRC_URI:append:j742s2 = " ${OPTEE_JACINTO_LPM_PATCHES}" -SRC_URI:append:j784s4 = " ${OPTEE_JACINTO_LPM_PATCHES}" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc index 0f040e6e7ae4..7284e49f1057 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc @@ -1,5 +1,5 @@ -PV = "4.7.0+git" -SRCREV = "a9690ae39995af36a31b7a4f446f27ea0787e3a4" +PV = "4.9.0+git" +SRCREV = "c2b0684fcd89929976a8726e6e3af922b48dd2c7" SRC_URI:remove = " \ file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \ file://0001-arm64.h-fix-compile-error-with-Clang.patch \ diff --git a/meta-ti-bsp/recipes-security/optee/optee-os/0001-plat-k3-drivers-Open-TRNG-firewall-for-TIFS-on-all-k.patch b/meta-ti-bsp/recipes-security/optee/optee-os/0001-plat-k3-drivers-Open-TRNG-firewall-for-TIFS-on-all-k.patch deleted file mode 100644 index 59d7a7955d18..000000000000 --- a/meta-ti-bsp/recipes-security/optee/optee-os/0001-plat-k3-drivers-Open-TRNG-firewall-for-TIFS-on-all-k.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 00f74ba2ab00088d51e6da3c0eefe50599ef5c82 Mon Sep 17 00:00:00 2001 -From: Prasanth Babu Mantena <[email protected]> -Date: Mon, 3 Nov 2025 12:42:57 +0530 -Subject: [PATCH] plat-k3: drivers: Open TRNG firewall for TIFS on all k3 devs - -On k3 devices, TRNG is firewalled to be accessed only by OPTEE. - -TIFS needs this for the encryption and decryption services to support -different low power modes. So, open firewall to TIFS as well. - -There is no concurrent usage of TRNG, as TIFS uses TRNG only at suspend -when OPTEE is down and resume, when firewalls are restored but OPTEE is -not up yet. - -As this is a firewall that required to be shared along with TIFS on all -devices, making this a common change and open on all devs. - -Upstream-Status: Submitted [https://github.com/OP-TEE/optee_os/pull/7582] - -Signed-off-by: Prasanth Babu Mantena <[email protected]> -Reviewed-by: Manorit Chawdhry <[email protected]> -Reviewed-by: Andrew Davis <[email protected]> ---- - core/arch/arm/plat-k3/drivers/sa2ul.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/core/arch/arm/plat-k3/drivers/sa2ul.c b/core/arch/arm/plat-k3/drivers/sa2ul.c -index c50757b2c..e10bde131 100644 ---- a/core/arch/arm/plat-k3/drivers/sa2ul.c -+++ b/core/arch/arm/plat-k3/drivers/sa2ul.c -@@ -121,12 +121,7 @@ static TEE_Result sa2ul_init(void) - start_address = RNG_BASE; - end_address = RNG_BASE + RNG_REG_SIZE - 1; - permissions[num_perm++] = (FW_BIG_ARM_PRIVID << 16) | FW_SECURE_ONLY; --#if defined(PLATFORM_FLAVOR_am62x) || \ -- defined(PLATFORM_FLAVOR_am62ax) || \ -- defined(PLATFORM_FLAVOR_am62px) -- - permissions[num_perm++] = (FW_TIFS_PRIVID << 16) | FW_NON_SECURE; --#endif - ret = ti_sci_set_fwl_region(fwl_id, rng_region, num_perm, - control, permissions, - start_address, end_address); --- -2.34.1 diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc index d2593cb8de94..f56d40de56f2 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc @@ -1,7 +1,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560" -PV = "4.7.0+git" -SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb" +PV = "4.9.0+git" +SRCREV = "b27648ea8472cceceb8dda368a965c709066f7aa" SRC_URI:remove = " \ file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \ -- 2.52.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#19498): https://lists.yoctoproject.org/g/meta-ti/message/19498 Mute This Topic: https://lists.yoctoproject.org/mt/117770382/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
