[02/10] arm-bsp/optee: TC: Set preferred version of OP-TEE to v3.14

Message ID 20220504165820.882784-2-arunachalam.ganapathy@arm.com
State New
Headers show
Series [01/10] arm/optee: Add optee 3.14 recipes | expand

Commit Message

Arunachalam Ganapathy May 4, 2022, 4:58 p.m. UTC
This also adds missing optee-os-tadevkit, optee-test append files

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: I1a217d9db7378f3ec711e984193b07ebb692e382
---
 meta-arm-bsp/conf/machine/include/tc.inc                  | 5 +++++
 .../optee/optee-os-tadevkit_3.14.0.bbappend               | 6 ++++++
 .../recipes-security/optee/optee-test_3.14.0.bbappend     | 8 ++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend

Patch

diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc
index 71cb17cd..0658dfbc 100644
--- a/meta-arm-bsp/conf/machine/include/tc.inc
+++ b/meta-arm-bsp/conf/machine/include/tc.inc
@@ -25,6 +25,11 @@  FIT_GENERATE_KEYS = "1"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack"
 PREFERRED_VERSION_linux-arm64-ack ?= "5.10"
 
+# OP-TEE
+PREFERRED_VERSION_optee-os ?= "3.14%"
+PREFERRED_VERSION_optee-client ?= "3.14%"
+PREFERRED_VERSION_optee-test ?= "3.14%"
+
 # Cannot use the default zImage on arm64
 KERNEL_IMAGETYPE = "Image"
 KERNEL_IMAGETYPES += "fitImage"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
new file mode 100644
index 00000000..6a22d47e
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
@@ -0,0 +1,6 @@ 
+# Machine specific configurations
+
+MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
+MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:tc = "optee-os-generic-tc.inc"
+
+require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}
diff --git a/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
new file mode 100644
index 00000000..f8194d0e
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
@@ -0,0 +1,8 @@ 
+# Machine specific configurations
+
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+
+MACHINE_OPTEE_TEST_REQUIRE ?= ""
+MACHINE_OPTEE_TEST_REQUIRE:tc = "optee-test-tc.inc"
+
+require ${MACHINE_OPTEE_TEST_REQUIRE}