From c38662e3bcdf1d147845cd922e18f6fa0cea99a2 Mon Sep 17 00:00:00 2001
From: Cedric VINCENT <cedric.vincent@foss.st.com>
Date: Wed, 22 Sep 2021 07:45:05 +0200
Subject: [PATCH] OPTEE-SDK: Add to SDK environment-setup the variables
 required to build OP-TEE TA.

Change-Id: I13a6e1f85f785ca4ce9cbb34dc2e46a16e4ca273
Signed-off-by: Cedric VINCENT <cedric.vincent@foss.st.com>
---
 .../include/st-machine-common-stm32mp.inc       |  5 +++++
 .../optee-sdk/environment.d-optee-sdk.sh        |  3 +++
 recipes-devtools/optee-sdk/optee-sdk_1.0.0.bb   | 17 +++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 recipes-devtools/optee-sdk/optee-sdk/environment.d-optee-sdk.sh
 create mode 100644 recipes-devtools/optee-sdk/optee-sdk_1.0.0.bb

diff --git a/conf/machine/include/st-machine-common-stm32mp.inc b/conf/machine/include/st-machine-common-stm32mp.inc
index a80df1f..8f05dca 100644
--- a/conf/machine/include/st-machine-common-stm32mp.inc
+++ b/conf/machine/include/st-machine-common-stm32mp.inc
@@ -430,6 +430,11 @@ ST_TOOLS_FOR_SDK_append = " \
     nativesdk-svd-tools \
     "
 
+# For Trusted Application development using OP-TEE TA SDK
+ST_TOOLS_FOR_SDK_append = " \
+    nativesdk-optee-sdk \
+    "
+
 # Fip tool
 ST_TOOLS_FOR_SDK_append = " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'fip', 'nativesdk-${FIPTOOL_WRAPPER}', '', d)} \
diff --git a/recipes-devtools/optee-sdk/optee-sdk/environment.d-optee-sdk.sh b/recipes-devtools/optee-sdk/optee-sdk/environment.d-optee-sdk.sh
new file mode 100644
index 0000000..d426027
--- /dev/null
+++ b/recipes-devtools/optee-sdk/optee-sdk/environment.d-optee-sdk.sh
@@ -0,0 +1,3 @@
+export TEEC_EXPORT=$SDKTARGETSYSROOT/usr
+export TA_DEV_KIT_DIR=$SDKTARGETSYSROOT/usr/include/optee/export-user_ta
+export LIBGCC_LOCATE_CFLAGS=--sysroot=$SDKTARGETSYSROOT
diff --git a/recipes-devtools/optee-sdk/optee-sdk_1.0.0.bb b/recipes-devtools/optee-sdk/optee-sdk_1.0.0.bb
new file mode 100644
index 0000000..7279ba8
--- /dev/null
+++ b/recipes-devtools/optee-sdk/optee-sdk_1.0.0.bb
@@ -0,0 +1,17 @@
+SUMMARY = "TA development kit built from optee_os, needed to build OP-TEE TAs"
+
+LICENSE = "MIT"
+
+SRC_URI_append_class-nativesdk = " file://environment.d-optee-sdk.sh"
+
+BBCLASSEXTEND = " nativesdk"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+do_install_append_class-nativesdk () {
+    mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
+    install -m 644 ${WORKDIR}/environment.d-optee-sdk.sh ${D}${SDKPATHNATIVE}/environment-setup.d/optee-sdk.sh
+}
+
+FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/optee-sdk.sh"