From 3ca84542eda5ecb4a6eae0c27b370f8bc23e499b Mon Sep 17 00:00:00 2001
From: Jens Wiklander <jens.wiklander@linaro.org>
Date: Tue, 6 Dec 2022 08:11:24 +0100
Subject: [PATCH] Enable compatibility with TEE Internal Core API v1.1

While the TEE Internal Core API in OP-TEE OS is updated, enable
compatibility with the last support version. This is done by by adding
CFG_TA_OPTEE_CORE_API_COMPAT_1_1==y in the TA makefile.

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
 acipher/ta/Makefile        | 1 +
 aes/ta/Makefile            | 1 +
 hello_world/ta/Makefile    | 1 +
 hotp/ta/Makefile           | 1 +
 plugins/ta/Makefile        | 1 +
 random/ta/Makefile         | 1 +
 secure_storage/ta/Makefile | 1 +
 7 files changed, 7 insertions(+)

diff --git a/acipher/ta/Makefile b/acipher/ta/Makefile
index 3dc150f..a99da5c 100644
--- a/acipher/ta/Makefile
+++ b/acipher/ta/Makefile
@@ -1,4 +1,5 @@
 CFG_TEE_TA_LOG_LEVEL ?= 4
+CFG_TA_OPTEE_CORE_API_COMPAT_1_1=y
 
 # The UUID for the Trusted Application
 BINARY=a734eed9-d6a1-4244-aa50-7c99719e7b7b
diff --git a/aes/ta/Makefile b/aes/ta/Makefile
index 27500d6..45e0986 100644
--- a/aes/ta/Makefile
+++ b/aes/ta/Makefile
@@ -1,4 +1,5 @@
 CFG_TEE_TA_LOG_LEVEL ?= 4
+CFG_TA_OPTEE_CORE_API_COMPAT_1_1=y
 
 # The UUID for the Trusted Application
 BINARY=5dbac793-f574-4871-8ad3-04331ec17f24
diff --git a/hello_world/ta/Makefile b/hello_world/ta/Makefile
index 45ad808..1891973 100644
--- a/hello_world/ta/Makefile
+++ b/hello_world/ta/Makefile
@@ -1,4 +1,5 @@
 CFG_TEE_TA_LOG_LEVEL ?= 4
+CFG_TA_OPTEE_CORE_API_COMPAT_1_1=y
 
 # The UUID for the Trusted Application
 BINARY=8aaaf200-2450-11e4-abe2-0002a5d5c51b
diff --git a/hotp/ta/Makefile b/hotp/ta/Makefile
index a592f04..5ae39fd 100644
--- a/hotp/ta/Makefile
+++ b/hotp/ta/Makefile
@@ -1,4 +1,5 @@
 CFG_TEE_TA_LOG_LEVEL ?= 3
+CFG_TA_OPTEE_CORE_API_COMPAT_1_1=y
 
 # The UUID for the Trusted Application
 BINARY=484d4143-2d53-4841-3120-4a6f636b6542
diff --git a/plugins/ta/Makefile b/plugins/ta/Makefile
index 0529635..1d5d2e5 100644
--- a/plugins/ta/Makefile
+++ b/plugins/ta/Makefile
@@ -1,4 +1,5 @@
 CFG_TEE_TA_LOG_LEVEL ?= 4
+CFG_TA_OPTEE_CORE_API_COMPAT_1_1=y
 
 # The UUID for the Trusted Application
 BINARY=2a287631-de1b-4fdd-a55c-b9312e40769a
diff --git a/random/ta/Makefile b/random/ta/Makefile
index af87f23..be90a80 100644
--- a/random/ta/Makefile
+++ b/random/ta/Makefile
@@ -1,4 +1,5 @@
 CFG_TEE_TA_LOG_LEVEL ?= 4
+CFG_TA_OPTEE_CORE_API_COMPAT_1_1=y
 
 # The UUID for the Trusted Application
 BINARY=b6c53aba-9669-4668-a7f2-205629d00f86
diff --git a/secure_storage/ta/Makefile b/secure_storage/ta/Makefile
index 447e995..a2fadda 100644
--- a/secure_storage/ta/Makefile
+++ b/secure_storage/ta/Makefile
@@ -1,4 +1,5 @@
 CFG_TEE_TA_LOG_LEVEL ?= 2
+CFG_TA_OPTEE_CORE_API_COMPAT_1_1=y
 
 # The UUID for the Trusted Application
 BINARY=f4e750bb-1437-4fbf-8785-8d3580c34994
