From a3481e5016db31bc6a59c9d03d927ecaf06b93e2 Mon Sep 17 00:00:00 2001
From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Date: Tue, 12 Jan 2021 15:20:43 +0000
Subject: [PATCH] arm-bsp/tc0: Add support for optee

This patch adds optee-os, optee-client, optee-test support in tc0 bsp.

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: I65f795b7ec2b4def4778b286b2f744b06b177157
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../recipes-security/optee/optee-client-tc0.inc  |  5 +++++
 .../optee/optee-client_3.11.0.bbappend           |  6 ++++++
 .../recipes-security/optee/optee-os-tc0.inc      | 16 ++++++++++++++++
 .../optee/optee-os_3.11.0.bbappend               |  6 ++++++
 .../recipes-security/optee/optee-test-tc0.inc    | 14 ++++++++++++++
 .../optee/optee-test_3.11.0.bbappend             |  6 ++++++
 6 files changed, 53 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-client-tc0.inc
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-client_3.11.0.bbappend
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tc0.inc
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_3.11.0.bbappend
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-test-tc0.inc
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-test_3.11.0.bbappend

diff --git a/meta-arm-bsp/recipes-security/optee/optee-client-tc0.inc b/meta-arm-bsp/recipes-security/optee/optee-client-tc0.inc
new file mode 100644
index 00000000..8b13386d
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-client-tc0.inc
@@ -0,0 +1,5 @@
+# TC0 specific configuration
+
+# Intermediate SHA with 3.11 baseline version
+SRCREV = "3f44b870299514ad8c6b7dee776eb2994d9c1cd4"
+PV = "3.11.0+git${SRCPV}"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-client_3.11.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-client_3.11.0.bbappend
new file mode 100644
index 00000000..fa4fd690
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-client_3.11.0.bbappend
@@ -0,0 +1,6 @@
+# Machine specific configurations
+
+MACHINE_OPTEE_CLIENT_REQUIRE ?= ""
+MACHINE_OPTEE_CLIENT_REQUIRE_tc0 = "optee-client-tc0.inc"
+
+require ${MACHINE_OPTEE_CLIENT_REQUIRE}
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tc0.inc b/meta-arm-bsp/recipes-security/optee/optee-os-tc0.inc
new file mode 100644
index 00000000..a700daf0
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-os-tc0.inc
@@ -0,0 +1,16 @@
+# TC0 specific configuration
+
+# Intermediate SHA with 3.11 baseline version
+SRCREV = "3284d935bc7e7bf7abfb5b19394a387d975d6dd4"
+PV = "3.11.0+git${SRCPV}"
+
+# This is incorporated into the SRCREV above
+SRC_URI_remove = " \
+    file://0001-libutils-provide-empty-__getauxval-implementation.patch \
+    file://0002-link.mk-implement-support-for-libnames-after-libgcc-.patch \
+    file://0003-ta_dev_kit.mk-make-sure-that-libutils-is-linked-seco.patch \
+"
+
+COMPATIBLE_MACHINE = "tc0"
+
+OPTEEMACHINE = "totalcompute-tc0"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_3.11.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os_3.11.0.bbappend
new file mode 100644
index 00000000..7b96a4d9
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.11.0.bbappend
@@ -0,0 +1,6 @@
+# Machine specific configurations
+
+MACHINE_OPTEE_OS_REQUIRE ?= ""
+MACHINE_OPTEE_OS_REQUIRE_tc0 = "optee-os-tc0.inc"
+
+require ${MACHINE_OPTEE_OS_REQUIRE}
diff --git a/meta-arm-bsp/recipes-security/optee/optee-test-tc0.inc b/meta-arm-bsp/recipes-security/optee/optee-test-tc0.inc
new file mode 100644
index 00000000..cca5076f
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-test-tc0.inc
@@ -0,0 +1,14 @@
+# TC0 specific configuration
+
+# Intermediate SHA with 3.11 baseline version
+SRCREV = "b35df64954ef96e09c0d5573014f4d1432dbc92f"
+PV = "3.11.0+git${SRCPV}"
+
+# This is incorporated into the SRCREV above
+SRC_URI_remove = " \
+    file://0001-host-xtest-Adjust-order-of-including-compiler.h.patch \
+    file://0002-make-remove-Wno-unsafe-loop-for-clang.patch \
+    file://0003-make-remove-Wmissing-noreturn-for-clang.patch \
+"
+
+COMPATIBLE_MACHINE = "tc0"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-test_3.11.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-test_3.11.0.bbappend
new file mode 100644
index 00000000..4fd1cdee
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-test_3.11.0.bbappend
@@ -0,0 +1,6 @@
+# Machine specific configurations
+
+MACHINE_OPTEE_TEST_REQUIRE ?= ""
+MACHINE_OPTEE_TEST_REQUIRE_tc0 = "optee-test-tc0.inc"
+
+require ${MACHINE_OPTEE_TEST_REQUIRE}