fix(fvp): add TBB build flags in relevant build configs
Some of the build configs are missing the TBB build flags. This
commit fixes this by adding the missing flags. The names of the
build and test configs are also updated to include TBB.
Signed-off-by: Elizabeth Ho <elizabeth.ho@arm.com>
Change-Id: I1441cc52cdf5920d812aec5a4457d1fe8bf2fbc1
diff --git a/group/tf-l1-build-fvp/fvp-gpt-romlib-fwu:nil b/group/tf-l1-build-fvp/fvp-gpt-romlib-fwu:nil
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l1-build-fvp/fvp-gpt-romlib-fwu:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-fvp/fvp-mb_hash256-romlib:nil b/group/tf-l1-build-fvp/fvp-mb_hash256-tbb_hash256-romlib:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-mb_hash256-romlib:nil
rename to group/tf-l1-build-fvp/fvp-mb_hash256-tbb_hash256-romlib:nil
diff --git a/group/tf-l1-build-fvp/fvp-ext-pstate-tspd-tsp-dram:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-ext-pstate-tspd-tsp-dram:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-ext-pstate-tspd-tsp-dram:nil
rename to group/tf-l1-build-fvp/fvp-tbb-mbedtls-ext-pstate-tspd-tsp-dram:nil
diff --git a/group/tf-l1-build-fvp/fvp-opteed-smc-load:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-opteed-smc-load:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-opteed-smc-load:nil
rename to group/tf-l1-build-fvp/fvp-tbb-mbedtls-opteed-smc-load:nil
diff --git a/group/tf-l1-build-fvp/fvp-opteed-sram:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-opteed-sram:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-opteed-sram:nil
rename to group/tf-l1-build-fvp/fvp-tbb-mbedtls-opteed-sram:nil
diff --git a/group/tf-l1-build-fvp/fvp-pncd:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-pncd:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-pncd:nil
rename to group/tf-l1-build-fvp/fvp-tbb-mbedtls-pncd:nil
diff --git a/group/tf-l1-build-fvp/fvp-romlib-cot-in-dtb:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-cot-in-dtb:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-romlib-cot-in-dtb:nil
rename to group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-cot-in-dtb:nil
diff --git a/group/tf-l1-build-fvp/fvp-tlkd:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-tlkd:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-tlkd:nil
rename to group/tf-l1-build-fvp/fvp-tbb-mbedtls-tlkd:nil
diff --git a/group/tf-l1-build-fvp/fvp-tpm_hash256-drtm-romlib:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-tpm_hash256-drtm-romlib:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-tpm_hash256-drtm-romlib:nil
rename to group/tf-l1-build-fvp/fvp-tbb-mbedtls-tpm_hash256-drtm-romlib:nil
diff --git a/group/tf-l1-build-fvp/fvp-tbb-pcnd:nil b/group/tf-l1-build-fvp/fvp-tbb-pcnd:nil
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l1-build-fvp/fvp-tbb-pcnd:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-fvp/fvp-tspd-dualroot:nil b/group/tf-l1-build-fvp/fvp-tspd-dualroot:nil
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l1-build-fvp/fvp-tspd-dualroot:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-fvp/fvp-tspd-tsp-dram-no-cohmem:nil b/group/tf-l1-build-fvp/fvp-tspd-tbb-mbedtls-tsp-dram-no-cohmem:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-tspd-tsp-dram-no-cohmem:nil
rename to group/tf-l1-build-fvp/fvp-tspd-tbb-mbedtls-tsp-dram-no-cohmem:nil
diff --git a/group/tf-l1-build-fvp/fvp-ext-pstate-tspd-tsp-dram:nil b/group/tf-l1-build-fvp/fvp-tspd-tbb-mbedtls-tsp-dram:nil
similarity index 100%
copy from group/tf-l1-build-fvp/fvp-ext-pstate-tspd-tsp-dram:nil
copy to group/tf-l1-build-fvp/fvp-tspd-tbb-mbedtls-tsp-dram:nil
diff --git a/group/tf-l1-build-fvp/fvp-tspd-tsp-dram-async:nil b/group/tf-l1-build-fvp/fvp-tspd-tbb-medtls-tsp-dram-async:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-tspd-tsp-dram-async:nil
rename to group/tf-l1-build-fvp/fvp-tspd-tbb-medtls-tsp-dram-async:nil
diff --git a/group/tf-l1-build-fvp/fvp-tspd-tsp-dram:nil b/group/tf-l1-build-fvp/fvp-tspd-tsp-dram:nil
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l1-build-fvp/fvp-tspd-tsp-dram:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-plat/imx8mm-mb_hash256-tbb-embedtls-debug:nil b/group/tf-l1-build-plat/imx8mm-mb_hash256-tbb-mbedtls-debug:nil
similarity index 100%
rename from group/tf-l1-build-plat/imx8mm-mb_hash256-tbb-embedtls-debug:nil
rename to group/tf-l1-build-plat/imx8mm-mb_hash256-tbb-mbedtls-debug:nil
diff --git a/tf_config/fvp-mb_hash256-romlib b/tf_config/fvp-mb_hash256-romlib
deleted file mode 100644
index 918c450..0000000
--- a/tf_config/fvp-mb_hash256-romlib
+++ /dev/null
@@ -1,5 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-MBOOT_EL_HASH_ALG=sha256
-MEASURED_BOOT=1
-PLAT=fvp
-USE_ROMLIB=1
diff --git a/tf_config/fvp-opteed-sram b/tf_config/fvp-opteed-sram
deleted file mode 100644
index d108db2..0000000
--- a/tf_config/fvp-opteed-sram
+++ /dev/null
@@ -1,4 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-FVP_TRUSTED_SRAM_SIZE=384
-PLAT=fvp
-SPD=opteed
diff --git a/tf_config/fvp-pncd b/tf_config/fvp-pncd
deleted file mode 100644
index d29b4cb..0000000
--- a/tf_config/fvp-pncd
+++ /dev/null
@@ -1,5 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-SPD=pncd
-SPD_PNCD_NS_IRQ=126
-SPD_PNCD_S_IRQ=15
diff --git a/tf_config/fvp-ext-pstate-tspd-tsp-dram b/tf_config/fvp-tbb-mbedtls-ext-pstate-tspd-tsp-dram
similarity index 66%
rename from tf_config/fvp-ext-pstate-tspd-tsp-dram
rename to tf_config/fvp-tbb-mbedtls-ext-pstate-tspd-tsp-dram
index e07ceb4..48e52a9 100644
--- a/tf_config/fvp-ext-pstate-tspd-tsp-dram
+++ b/tf_config/fvp-tbb-mbedtls-ext-pstate-tspd-tsp-dram
@@ -1,6 +1,9 @@
ARM_RECOM_STATE_ID_ENC=1
+ARM_ROTPK_LOCATION=devel_rsa
ARM_TSP_RAM_LOCATION=dram
CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
PLAT=fvp
PSCI_EXTENDED_STATE_ID=1
SPD=tspd
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-opteed-smc-load b/tf_config/fvp-tbb-mbedtls-opteed-smc-load
similarity index 66%
rename from tf_config/fvp-opteed-smc-load
rename to tf_config/fvp-tbb-mbedtls-opteed-smc-load
index 4efd78d..b10dfb1 100644
--- a/tf_config/fvp-opteed-smc-load
+++ b/tf_config/fvp-tbb-mbedtls-opteed-smc-load
@@ -1,6 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
CROSS_COMPILE=aarch64-none-elf-
FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
OPTEE_ALLOW_SMC_LOAD=1
PLAT=fvp
PLAT_XLAT_TABLES_DYNAMIC=1
SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-gpt-romlib-fwu b/tf_config/fvp-tbb-mbedtls-opteed-sram
similarity index 70%
copy from tf_config/fvp-gpt-romlib-fwu
copy to tf_config/fvp-tbb-mbedtls-opteed-sram
index d784c5a..e6882b9 100644
--- a/tf_config/fvp-gpt-romlib-fwu
+++ b/tf_config/fvp-tbb-mbedtls-opteed-sram
@@ -1,8 +1,7 @@
-ARM_GPT_SUPPORT=1
ARM_ROTPK_LOCATION=devel_rsa
CROSS_COMPILE=aarch64-none-elf-
FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
PLAT=fvp
-PSA_FWU_SUPPORT=1
-USE_ROMLIB=1
+SPD=opteed
TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-pcnd b/tf_config/fvp-tbb-mbedtls-pncd
similarity index 100%
rename from tf_config/fvp-tbb-pcnd
rename to tf_config/fvp-tbb-mbedtls-pncd
diff --git a/tf_config/fvp-gpt-romlib-fwu b/tf_config/fvp-tbb-mbedtls-tlkd
similarity index 70%
rename from tf_config/fvp-gpt-romlib-fwu
rename to tf_config/fvp-tbb-mbedtls-tlkd
index d784c5a..1efdfad 100644
--- a/tf_config/fvp-gpt-romlib-fwu
+++ b/tf_config/fvp-tbb-mbedtls-tlkd
@@ -1,8 +1,7 @@
-ARM_GPT_SUPPORT=1
ARM_ROTPK_LOCATION=devel_rsa
CROSS_COMPILE=aarch64-none-elf-
FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
PLAT=fvp
-PSA_FWU_SUPPORT=1
-USE_ROMLIB=1
+SPD=tlkd
TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-romlib-cot-in-dtb b/tf_config/fvp-tbb-mbedtls-tpm_hash256-drtm-romlib
similarity index 67%
rename from tf_config/fvp-romlib-cot-in-dtb
rename to tf_config/fvp-tbb-mbedtls-tpm_hash256-drtm-romlib
index 551a562..cc3ef70 100644
--- a/tf_config/fvp-romlib-cot-in-dtb
+++ b/tf_config/fvp-tbb-mbedtls-tpm_hash256-drtm-romlib
@@ -1,6 +1,8 @@
ARM_ROTPK_LOCATION=devel_rsa
CROSS_COMPILE=aarch64-none-elf-
-COT_DESC_IN_DTB=1
+DRTM_SUPPORT=1
+GENERATE_COT=1
PLAT=fvp
+TPM_HASH_ALG=sha256
TRUSTED_BOARD_BOOT=1
USE_ROMLIB=1
diff --git a/tf_config/fvp-tlkd b/tf_config/fvp-tlkd
deleted file mode 100644
index 56c416e..0000000
--- a/tf_config/fvp-tlkd
+++ /dev/null
@@ -1,3 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-SPD=tlkd
diff --git a/tf_config/fvp-tpm_hash256-drtm-romlib b/tf_config/fvp-tpm_hash256-drtm-romlib
deleted file mode 100644
index 314de33..0000000
--- a/tf_config/fvp-tpm_hash256-drtm-romlib
+++ /dev/null
@@ -1,5 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-DRTM_SUPPORT=1
-PLAT=fvp
-TPM_HASH_ALG=sha256
-USE_ROMLIB=1
diff --git a/tf_config/fvp-tspd-dualroot b/tf_config/fvp-tspd-dualroot
deleted file mode 100644
index f83896d..0000000
--- a/tf_config/fvp-tspd-dualroot
+++ /dev/null
@@ -1,4 +0,0 @@
-COT=dualroot
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-SPD=tspd
diff --git a/tf_config/fvp-romlib-cot-in-dtb b/tf_config/fvp-tspd-tbb-mbedtls-tsp-dram
similarity index 64%
copy from tf_config/fvp-romlib-cot-in-dtb
copy to tf_config/fvp-tspd-tbb-mbedtls-tsp-dram
index 551a562..866f62d 100644
--- a/tf_config/fvp-romlib-cot-in-dtb
+++ b/tf_config/fvp-tspd-tbb-mbedtls-tsp-dram
@@ -1,6 +1,7 @@
ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=dram
CROSS_COMPILE=aarch64-none-elf-
-COT_DESC_IN_DTB=1
+GENERATE_COT=1
PLAT=fvp
+SPD=tspd
TRUSTED_BOARD_BOOT=1
-USE_ROMLIB=1
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-tsp-dram-no-cohmem b/tf_config/fvp-tspd-tbb-mbedtls-tsp-dram-no-cohmem
new file mode 100644
index 0000000..a49bc71
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-mbedtls-tsp-dram-no-cohmem
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-tspd-tsp-dram-async b/tf_config/fvp-tspd-tbb-medtls-tsp-dram-async
similarity index 65%
rename from tf_config/fvp-tspd-tsp-dram-async
rename to tf_config/fvp-tspd-tbb-medtls-tsp-dram-async
index 28f26de..d1e0c13 100644
--- a/tf_config/fvp-tspd-tsp-dram-async
+++ b/tf_config/fvp-tspd-tbb-medtls-tsp-dram-async
@@ -1,6 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
ARM_TSP_RAM_LOCATION=dram
CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
PLAT=fvp
SPD=tspd
+TRUSTED_BOARD_BOOT=1
TSP_INIT_ASYNC=1
TSP_NS_INTR_ASYNC_PREEMPT=1
diff --git a/tf_config/fvp-tspd-tsp-dram-no-cohmem b/tf_config/fvp-tspd-tsp-dram-no-cohmem
deleted file mode 100644
index ae3e1b0..0000000
--- a/tf_config/fvp-tspd-tsp-dram-no-cohmem
+++ /dev/null
@@ -1,5 +0,0 @@
-ARM_TSP_RAM_LOCATION=dram
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-SPD=tspd
-USE_COHERENT_MEM=0
diff --git a/tf_config/imx8mm-mb_hash256-tbb-embedtls-debug b/tf_config/imx8mm-mb_hash256-tbb-mbedtls-debug
similarity index 100%
rename from tf_config/imx8mm-mb_hash256-tbb-embedtls-debug
rename to tf_config/imx8mm-mb_hash256-tbb-mbedtls-debug