Add support for 64-bit TAs
common: Add CROSS_COMPILE_ta_arm## flags
hikey and mediatek: Update with new TA dev kit name
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/common.mk b/common.mk
index 3f39506..633717a 100644
--- a/common.mk
+++ b/common.mk
@@ -114,6 +114,8 @@
################################################################################
OPTEE_OS_COMMON_FLAGS ?= CROSS_COMPILE=$(CROSS_COMPILE_S_USER) \
CROSS_COMPILE_core=$(CROSS_COMPILE_S_KERNEL) \
+ CROSS_COMPILE_ta_arm64=$(AARCH64_CROSS_COMPILE) \
+ CROSS_COMPILE_ta_arm32=$(AARCH32_CROSS_COMPILE) \
CFG_TEE_CORE_LOG_LEVEL=3 \
DEBUG=$(DEBUG)
diff --git a/hikey.mk b/hikey.mk
index acc8f3d..10306af 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -1,12 +1,28 @@
+################################################################################
+# User-defined variables
+# Edit so these match your target
+################################################################################
+# Non-secure user mode (root fs binaries): 32 or 64-bit [default 64]
NSU ?= 64
-SU ?= 32
+# Secure kernel (OP-TEE OS): 32 or 64-bit [default 64]
SK ?= 64
+# Secure user mode (Trusted Apps): 32 or 64-bit [default 32, requires SK=64 for 64]
+SU ?= 32
+################################################################################
+# Includes
+################################################################################
-include common.mk
################################################################################
# Mandatory definition to use common.mk
################################################################################
+ifeq ($(SK),32)
+ifeq ($(SU),64)
+$(error 64-bit secure user mode requires 64-bit secure kernel, i.e. SK=64)
+endif
+endif
+
ifeq ($(NSU),64)
CROSS_COMPILE_NS_USER ?= "$(CCACHE)$(AARCH64_CROSS_COMPILE)"
MULTIARCH := aarch64-linux-gnu
@@ -26,7 +42,7 @@
CROSS_COMPILE_S_KERNEL ?= "$(CCACHE)$(AARCH32_CROSS_COMPILE)"
endif
OPTEE_OS_BIN ?= $(OPTEE_OS_PATH)/out/arm-plat-hikey/core/tee.bin
-OPTEE_OS_TA_DEV_KIT_DIR ?= $(OPTEE_OS_PATH)/out/arm-plat-hikey/export-user_ta
+OPTEE_OS_TA_DEV_KIT_DIR ?= $(OPTEE_OS_PATH)/out/arm-plat-hikey/export-ta_arm$(SU)
################################################################################
# Paths to git projects and various binaries
diff --git a/mediatek.mk b/mediatek.mk
index 861737e..3245be5 100644
--- a/mediatek.mk
+++ b/mediatek.mk
@@ -8,7 +8,7 @@
CROSS_COMPILE_S_USER ?= "$(CCACHE)$(AARCH32_CROSS_COMPILE)"
CROSS_COMPILE_S_KERNEL ?= "$(CCACHE)$(AARCH64_CROSS_COMPILE)"
OPTEE_OS_BIN ?= $(OPTEE_OS_PATH)/out/arm-plat-mediatek/core/tee-pager.bin
-OPTEE_OS_TA_DEV_KIT_DIR ?= $(OPTEE_OS_PATH)/out/arm-plat-mediatek/export-user_ta
+OPTEE_OS_TA_DEV_KIT_DIR ?= $(OPTEE_OS_PATH)/out/arm-plat-mediatek/export-ta_arm32
################################################################################
# Paths to git projects and various binaries