From: Manorit Chawdhry <[email protected]>
Update optee_os, optee_client, optee_examples and optee_test to the
newer 4.9.0 tag.
Signed-off-by: Manorit Chawdhry <[email protected]>
Signed-off-by: Ryan Eatmon <[email protected]>
---
v2: Removed platform specific backported patches that are no longer
needed.
.../optee/optee-client-ti-version.inc | 8 ++------
.../optee/optee-examples-ti-version.inc | 4 ++--
.../recipes-security/optee/optee-ftpm-ti-version.inc | 4 ++--
.../recipes-security/optee/optee-os-ti-overrides.inc | 9 ---------
.../recipes-security/optee/optee-os-ti-version.inc | 11 ++---------
.../recipes-security/optee/optee-test-ti-version.inc | 5 ++---
6 files changed, 10 insertions(+), 31 deletions(-)
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 ec10cefe..68b6b262 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,6 +1,2 @@
-PV = "4.7.0+git"
-SRCREV = "23c112a6f05cc5e39bd4aaf52ad515cad532237d"
-
-SRC_URI:remove = " \
-
file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \
-"
+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 91dd5e60..6ec2a83d 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-ftpm-ti-version.inc
b/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc
index edc9d68e..350eb9c9 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc
@@ -1,3 +1,3 @@
-PV = "4.7.0+git"
+PV = "4.9.0+git"
OPTEE_TA_GIT_TAG = "${@'branch=master' if d.getVar('PV') == 'git'
or d.getVar('PV').endswith('+git') else 'tag=%s;nobranch=1' %
d.getVar('PV')}"
-SRCREV_optee-ta = "ce33372ab772e879826361a1ca91126260bd9be1"
+SRCREV_optee-ta = "a09269b15de635e1816fe832e26adfbfb44c5455"
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 30dbb430..83087030 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 \