aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/arch/arm/arm.mk8
-rw-r--r--core/arch/arm/plat-d02/conf.mk4
-rw-r--r--core/arch/arm/plat-hikey/conf.mk3
-rw-r--r--core/arch/arm/plat-imx/conf.mk2
-rw-r--r--core/arch/arm/plat-k3/conf.mk3
-rw-r--r--core/arch/arm/plat-ls/conf.mk2
-rw-r--r--core/arch/arm/plat-marvell/conf.mk3
-rw-r--r--core/arch/arm/plat-mediatek/conf.mk3
-rw-r--r--core/arch/arm/plat-poplar/conf.mk3
-rw-r--r--core/arch/arm/plat-rcar/conf.mk6
-rw-r--r--core/arch/arm/plat-rockchip/conf.mk2
-rw-r--r--core/arch/arm/plat-rpi3/conf.mk3
-rw-r--r--core/arch/arm/plat-sam/conf.mk2
-rw-r--r--core/arch/arm/plat-sprd/conf.mk3
-rw-r--r--core/arch/arm/plat-stm/conf.mk2
-rw-r--r--core/arch/arm/plat-stm32mp1/conf.mk1
-rw-r--r--core/arch/arm/plat-sunxi/conf.mk3
-rw-r--r--core/arch/arm/plat-ti/conf.mk2
-rw-r--r--core/arch/arm/plat-vexpress/conf.mk3
-rw-r--r--core/arch/arm/plat-zynq7k/conf.mk2
-rw-r--r--core/arch/arm/plat-zynqmp/conf.mk3
-rw-r--r--documentation/porting_guidelines.md3
22 files changed, 10 insertions, 56 deletions
diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk
index 7e15ae1f..e9ba1e6a 100644
--- a/core/arch/arm/arm.mk
+++ b/core/arch/arm/arm.mk
@@ -143,6 +143,14 @@ core-platform-aflags += $(core_arm32-platform-aflags)
core-platform-aflags += $(arm32-platform-aflags)
endif
+# Provide default ta-targets if not set by the platform config
+ifeq (,$(ta-targets))
+ta-targets = ta_arm32
+ifeq ($(CFG_ARM64_core),y)
+ta-targets += ta_arm64
+endif
+endif
+
ifneq ($(filter ta_arm32,$(ta-targets)),)
# Variables for ta-target/sm "ta_arm32"
CFG_ARM32_ta_arm32 := y
diff --git a/core/arch/arm/plat-d02/conf.mk b/core/arch/arm/plat-d02/conf.mk
index 8fa14e6f..97080ef6 100644
--- a/core/arch/arm/plat-d02/conf.mk
+++ b/core/arch/arm/plat-d02/conf.mk
@@ -18,15 +18,13 @@ $(call force,CFG_HI16XX_RNG,y)
endif
$(call force,CFG_WITH_LPAE,y)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
-ta-targets += ta_arm64
CFG_CORE_TZSRAM_EMUL_SIZE ?= 655360
else
$(call force,CFG_ARM32_core,y)
CFG_CORE_TZSRAM_EMUL_SIZE ?= 524288
endif
+
# 20MB-384kB of secure RAM
ifeq ($(CFG_WITH_PAGER),y)
CFG_TEE_RAM_VA_SIZE ?= 0x00400000
diff --git a/core/arch/arm/plat-hikey/conf.mk b/core/arch/arm/plat-hikey/conf.mk
index 068b0912..6fcd6be9 100644
--- a/core/arch/arm/plat-hikey/conf.mk
+++ b/core/arch/arm/plat-hikey/conf.mk
@@ -9,11 +9,8 @@ $(call force,CFG_PM_STUBS,y)
$(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
$(call force,CFG_WITH_ARM_TRUSTED_FW,y)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
index 88fd7382..54aa4ffb 100644
--- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk
@@ -201,8 +201,6 @@ CFG_PAGEABLE_ADDR ?= 0
CFG_PSCI_ARM32 ?= y
CFG_SECURE_TIME_SOURCE_REE ?= y
CFG_UART_BASE ?= UART1_BASE
-
-ta-targets = ta_arm32
endif
ifeq ($(filter y, $(CFG_PSCI_ARM32)), y)
diff --git a/core/arch/arm/plat-k3/conf.mk b/core/arch/arm/plat-k3/conf.mk
index 32b94f82..5f38a1a7 100644
--- a/core/arch/arm/plat-k3/conf.mk
+++ b/core/arch/arm/plat-k3/conf.mk
@@ -20,11 +20,8 @@ $(call force,CFG_GIC,y)
$(call force,CFG_ARM_GICV3,y)
$(call force,CFG_CORE_CLUSTER_SHIFT,1)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
diff --git a/core/arch/arm/plat-ls/conf.mk b/core/arch/arm/plat-ls/conf.mk
index 69578baf..7b697a72 100644
--- a/core/arch/arm/plat-ls/conf.mk
+++ b/core/arch/arm/plat-ls/conf.mk
@@ -113,11 +113,9 @@ endif
#Keeping Number of TEE thread equal to number of cores on the SoC
CFG_NUM_THREADS ?= CFG_TEE_CORE_NB_CORE
-ta-targets = ta_arm32
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets = ta_arm64
else
$(call force,CFG_ARM32_core,y)
$(call force,CFG_SECONDARY_INIT_CNTFRQ,y)
diff --git a/core/arch/arm/plat-marvell/conf.mk b/core/arch/arm/plat-marvell/conf.mk
index 68ad0f7e..90a43592 100644
--- a/core/arch/arm/plat-marvell/conf.mk
+++ b/core/arch/arm/plat-marvell/conf.mk
@@ -43,11 +43,8 @@ $(call force,CFG_PM_STUBS,y)
$(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
$(call force,CFG_CORE_CLUSTER_SHIFT,1)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
diff --git a/core/arch/arm/plat-mediatek/conf.mk b/core/arch/arm/plat-mediatek/conf.mk
index 3bae090b..2cd2acde 100644
--- a/core/arch/arm/plat-mediatek/conf.mk
+++ b/core/arch/arm/plat-mediatek/conf.mk
@@ -14,11 +14,8 @@ $(call force,CFG_PM_STUBS,y)
$(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
$(call force,CFG_WITH_ARM_TRUSTED_FW,y)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
diff --git a/core/arch/arm/plat-poplar/conf.mk b/core/arch/arm/plat-poplar/conf.mk
index d39886bb..bf221b81 100644
--- a/core/arch/arm/plat-poplar/conf.mk
+++ b/core/arch/arm/plat-poplar/conf.mk
@@ -8,11 +8,8 @@ $(call force,CFG_PM_STUBS,y)
$(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
$(call force,CFG_WITH_ARM_TRUSTED_FW,y)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
CFG_CORE_TZSRAM_EMUL_SIZE ?= 655360
else
$(call force,CFG_ARM32_core,y)
diff --git a/core/arch/arm/plat-rcar/conf.mk b/core/arch/arm/plat-rcar/conf.mk
index 5357f25e..f7b626a2 100644
--- a/core/arch/arm/plat-rcar/conf.mk
+++ b/core/arch/arm/plat-rcar/conf.mk
@@ -18,13 +18,9 @@ endif
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
+ta-targets = ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
-ifeq ($(CFG_ARM32_core),y)
-ta-targets = ta_arm32
-endif
-
CFG_WITH_STACK_CANARIES ?= y
diff --git a/core/arch/arm/plat-rockchip/conf.mk b/core/arch/arm/plat-rockchip/conf.mk
index 5de3b818..8e3a9928 100644
--- a/core/arch/arm/plat-rockchip/conf.mk
+++ b/core/arch/arm/plat-rockchip/conf.mk
@@ -14,7 +14,5 @@ $(call force,CFG_PSCI_ARM32,y)
$(call force,CFG_BOOT_SECONDARY_REQUEST,y)
$(call force,CFG_8250_UART,y)
-ta-targets = ta_arm32
-
CFG_WITH_STACK_CANARIES ?= y
CFG_WITH_STATS ?= y
diff --git a/core/arch/arm/plat-rpi3/conf.mk b/core/arch/arm/plat-rpi3/conf.mk
index 9bc8c5c1..ef1ed4dc 100644
--- a/core/arch/arm/plat-rpi3/conf.mk
+++ b/core/arch/arm/plat-rpi3/conf.mk
@@ -8,11 +8,8 @@ $(call force,CFG_PM_STUBS,y)
$(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
$(call force,CFG_WITH_ARM_TRUSTED_FW,y)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
diff --git a/core/arch/arm/plat-sam/conf.mk b/core/arch/arm/plat-sam/conf.mk
index 8706b0c2..f55d756d 100644
--- a/core/arch/arm/plat-sam/conf.mk
+++ b/core/arch/arm/plat-sam/conf.mk
@@ -12,6 +12,4 @@ $(call force,CFG_PL310,y)
$(call force,CFG_PL310_LOCKED,y)
$(call force,CFG_AT91_MATRIX,y)
-ta-targets = ta_arm32
-
CFG_WITH_STACK_CANARIES ?= y
diff --git a/core/arch/arm/plat-sprd/conf.mk b/core/arch/arm/plat-sprd/conf.mk
index 49c13c2f..b5e04216 100644
--- a/core/arch/arm/plat-sprd/conf.mk
+++ b/core/arch/arm/plat-sprd/conf.mk
@@ -5,11 +5,8 @@ include core/arch/arm/cpu/cortex-armv8-0.mk
$(call force,CFG_TEE_CORE_NB_CORE,8)
$(call force,CFG_WITH_ARM_TRUSTED_FW,y)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
diff --git a/core/arch/arm/plat-stm/conf.mk b/core/arch/arm/plat-stm/conf.mk
index 85de5249..e79b3d39 100644
--- a/core/arch/arm/plat-stm/conf.mk
+++ b/core/arch/arm/plat-stm/conf.mk
@@ -11,8 +11,6 @@ $(call force,CFG_GENERIC_BOOT,y)
$(call force,CFG_WITH_LPAE,n)
$(call force,CFG_GIC,y)
-ta-targets = ta_arm32
-
CFG_WITH_PAGER ?= n
CFG_BOOT_SYNC_CPU ?= y
CFG_TEE_CORE_EMBED_INTERNAL_TESTS ?= y
diff --git a/core/arch/arm/plat-stm32mp1/conf.mk b/core/arch/arm/plat-stm32mp1/conf.mk
index 7a9e6c20..36b6e9df 100644
--- a/core/arch/arm/plat-stm32mp1/conf.mk
+++ b/core/arch/arm/plat-stm32mp1/conf.mk
@@ -6,7 +6,6 @@ flavorlist-1G = stm32mp157c-ev1.dts stm32mp157c-ed1.dts
flavorlist-512M = stm32mp157c-dk2.dts
include core/arch/arm/cpu/cortex-a7.mk
-ta-targets = ta_arm32
$(call force,CFG_BOOT_SECONDARY_REQUEST,y)
$(call force,CFG_GENERIC_BOOT,y)
diff --git a/core/arch/arm/plat-sunxi/conf.mk b/core/arch/arm/plat-sunxi/conf.mk
index 52aa2680..86992bcf 100644
--- a/core/arch/arm/plat-sunxi/conf.mk
+++ b/core/arch/arm/plat-sunxi/conf.mk
@@ -29,13 +29,10 @@ CFG_SHMEM_START ?= 0x5fe00000
CFG_SHMEM_SIZE ?= 0x00200000
endif
-ta-targets = ta_arm32
-
ifeq ($(PLATFORM_FLAVOR),sun50i_a64)
include core/arch/arm/cpu/cortex-armv8-0.mk
$(call force,CFG_ARM64_core,y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
CFG_TZDRAM_START ?= 0x40000000
CFG_TZDRAM_SIZE ?= 0x2000000
diff --git a/core/arch/arm/plat-ti/conf.mk b/core/arch/arm/plat-ti/conf.mk
index 57303c79..3143d79c 100644
--- a/core/arch/arm/plat-ti/conf.mk
+++ b/core/arch/arm/plat-ti/conf.mk
@@ -45,5 +45,3 @@ $(call force,CFG_GIC,y)
ifneq ($(CFG_WITH_SOFTWARE_PRNG),y)
$(call force,CFG_DRA7_RNG,y)
endif
-
-ta-targets = ta_arm32
diff --git a/core/arch/arm/plat-vexpress/conf.mk b/core/arch/arm/plat-vexpress/conf.mk
index 6d4dbe06..e8a95601 100644
--- a/core/arch/arm/plat-vexpress/conf.mk
+++ b/core/arch/arm/plat-vexpress/conf.mk
@@ -35,11 +35,8 @@ $(call force,CFG_PL011,y)
$(call force,CFG_PM_STUBS,y)
$(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
diff --git a/core/arch/arm/plat-zynq7k/conf.mk b/core/arch/arm/plat-zynq7k/conf.mk
index 7d460f38..b13d7fa5 100644
--- a/core/arch/arm/plat-zynq7k/conf.mk
+++ b/core/arch/arm/plat-zynq7k/conf.mk
@@ -13,8 +13,6 @@ $(call force,CFG_PL310,y)
$(call force,CFG_PL310_LOCKED,y)
$(call force,CFG_SECURE_TIME_SOURCE_REE,y)
-ta-targets = ta_arm32
-
CFG_BOOT_SYNC_CPU ?= y
CFG_BOOT_SECONDARY_REQUEST ?= y
CFG_CRYPTO_SIZE_OPTIMIZATION ?= n
diff --git a/core/arch/arm/plat-zynqmp/conf.mk b/core/arch/arm/plat-zynqmp/conf.mk
index 67137a67..60ebb38e 100644
--- a/core/arch/arm/plat-zynqmp/conf.mk
+++ b/core/arch/arm/plat-zynqmp/conf.mk
@@ -10,11 +10,8 @@ $(call force,CFG_PM_STUBS,y)
$(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
$(call force,CFG_WITH_ARM_TRUSTED_FW,y)
-ta-targets = ta_arm32
-
ifeq ($(CFG_ARM64_core),y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets += ta_arm64
else
$(call force,CFG_ARM32_core,y)
endif
diff --git a/documentation/porting_guidelines.md b/documentation/porting_guidelines.md
index 7c0c4df7..a7b966cd 100644
--- a/documentation/porting_guidelines.md
+++ b/documentation/porting_guidelines.md
@@ -85,9 +85,6 @@ $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
$(call force,CFG_WITH_ARM_TRUSTED_FW,y)
$(call force,CFG_WITH_LPAE,y)
-ta-targets = ta_arm32
-ta-targets += ta_arm64
-
CFG_NUM_THREADS ?= 8
CFG_CRYPTO_WITH_CE ?= y
CFG_WITH_STACK_CANARIES ?= y
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 20:08:30 +0000