From 48c1342f9a170668e9ee39b560e1adc858cd9a69 Mon Sep 17 00:00:00 2001
From: Ben Horgan <ben.horgan@arm.com>
Date: Fri, 7 Jan 2022 16:01:23 +0000
Subject: [PATCH] arm-bsp/optee-os-tadevkit: total-compute: Add
 optee-os-tadevkit

The optee-os recipe was recently split into optee-os and
optee-os-tadevkit.

Signed-off-by: Ben Horgan <ben.horgan@arm.com>
Change-Id: Id9794b7c4a7e2f3fac4286498fa44c35fd8aaa0b
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../optee/optee-os-generic-tc.inc             | 20 +++++++++++++++++++
 .../optee/optee-os-tadevkit_3.14.0.bbappend   |  6 ++++++
 .../recipes-security/optee/optee-os-tc.inc    | 18 +----------------
 3 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend

diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc b/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
new file mode 100644
index 00000000..da6a06f3
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
@@ -0,0 +1,20 @@
+# Total Compute (tc) specific configuration for optee-os and optee-os-tadevkit
+
+# Intermediate SHA with 3.14 baseline version
+# This has TC0 platform support
+SRCREV = "e4f34e786135079160697d88212591105a65fbce"
+PV = "3.14.0+git${SRCPV}"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/tc:"
+SRC_URI:append:tc = " \
+    file://sp_layout.json \
+    file://0001-WIP-Enable-managed-exit.patch \
+    file://0002-plat-totalcompute-Update-messaging-method-for-manage.patch \
+    file://0003-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch \
+    "
+
+COMPATIBLE_MACHINE = "(tc?)"
+
+OPTEEMACHINE:tc0 = "totalcompute-tc0"
+OPTEEMACHINE:tc1 = "totalcompute-tc1"
+
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-os-tc.inc b/meta-arm-bsp/recipes-security/optee/optee-os-tc.inc
index bd6c638d..79366522 100644
--- a/meta-arm-bsp/recipes-security/optee/optee-os-tc.inc
+++ b/meta-arm-bsp/recipes-security/optee/optee-os-tc.inc
@@ -1,22 +1,6 @@
 # TC0 specific configuration
 
-# Intermediate SHA with 3.14 baseline version
-# This has TC0 platform support
-SRCREV = "e4f34e786135079160697d88212591105a65fbce"
-PV = "3.14.0+git${SRCPV}"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/tc:"
-SRC_URI:append:tc = " \
-    file://sp_layout.json \
-    file://0001-WIP-Enable-managed-exit.patch \
-    file://0002-plat-totalcompute-Update-messaging-method-for-manage.patch \
-    file://0003-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch \
-    "
-
-COMPATIBLE_MACHINE = "(tc?)"
-
-OPTEEMACHINE:tc0 = "totalcompute-tc0"
-OPTEEMACHINE:tc1 = "totalcompute-tc1"
+require optee-os-generic-tc.inc
 
 # Enable optee memory layout and boot logs
 EXTRA_OEMAKE += " CFG_TEE_CORE_LOG_LEVEL=3"