diff --git a/tf_config/a3700-default b/tf_config/a3700-default
new file mode 100644
index 0000000..bf4ecd9
--- /dev/null
+++ b/tf_config/a3700-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=a3700
diff --git a/tf_config/a5ds b/tf_config/a5ds
new file mode 100644
index 0000000..4247dda
--- /dev/null
+++ b/tf_config/a5ds
@@ -0,0 +1,8 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+ARM_CORTEX_A5=yes
+ARM_XLAT_TABLES_LIB_V1=1
+CROSS_COMPILE=arm-none-eabi-
+FVP_HW_CONFIG_DTS=fdts/a5ds.dts
+PLAT=a5ds
diff --git a/tf_config/a5ds-error-deprecated b/tf_config/a5ds-error-deprecated
new file mode 100644
index 0000000..eaa6c04
--- /dev/null
+++ b/tf_config/a5ds-error-deprecated
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+ARM_CORTEX_A5=yes
+ARM_XLAT_TABLES_LIB_V1=1
+CROSS_COMPILE=arm-none-eabi-
+ERROR_DEPRECATED=1
+FVP_HW_CONFIG_DTS=fdts/a5ds.dts
+PLAT=a5ds
diff --git a/tf_config/a70x0-default b/tf_config/a70x0-default
new file mode 100644
index 0000000..46933c4
--- /dev/null
+++ b/tf_config/a70x0-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
+PLAT=a70x0
+SCP_BL2=/dev/null
diff --git a/tf_config/a70x0_amc-default b/tf_config/a70x0_amc-default
new file mode 100644
index 0000000..9596452
--- /dev/null
+++ b/tf_config/a70x0_amc-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
+PLAT=a70x0_amc
+SCP_BL2=/dev/null
diff --git a/tf_config/a80x0-default b/tf_config/a80x0-default
new file mode 100644
index 0000000..be2c5d8
--- /dev/null
+++ b/tf_config/a80x0-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
+PLAT=a80x0
+SCP_BL2=/dev/null
diff --git a/tf_config/a80x0_mcbin-default b/tf_config/a80x0_mcbin-default
new file mode 100644
index 0000000..07f5549
--- /dev/null
+++ b/tf_config/a80x0_mcbin-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
+PLAT=a80x0_mcbin
+SCP_BL2=/dev/null
diff --git a/tf_config/agilex-default b/tf_config/agilex-default
new file mode 100644
index 0000000..5bb6b77
--- /dev/null
+++ b/tf_config/agilex-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=agilex
diff --git a/tf_config/arm_fpga-default b/tf_config/arm_fpga-default
new file mode 100644
index 0000000..533cc4c
--- /dev/null
+++ b/tf_config/arm_fpga-default
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+FPGA_PRELOADED_DTB_BASE=0x88000000
+PLAT=arm_fpga
+PRELOADED_BL33_BASE=0x82080000
diff --git a/tf_config/axg-atos b/tf_config/axg-atos
new file mode 100644
index 0000000..8ede3ae
--- /dev/null
+++ b/tf_config/axg-atos
@@ -0,0 +1,3 @@
+AML_USE_ATOS=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=axg
diff --git a/tf_config/axg-default b/tf_config/axg-default
new file mode 100644
index 0000000..02f3a4d
--- /dev/null
+++ b/tf_config/axg-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=axg
diff --git a/tf_config/axg-opteed b/tf_config/axg-opteed
new file mode 100644
index 0000000..1a0629a
--- /dev/null
+++ b/tf_config/axg-opteed
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=axg
+SPD=opteed
diff --git a/tf_config/corstone700-error-deprecated b/tf_config/corstone700-error-deprecated
new file mode 100644
index 0000000..5830dc9
--- /dev/null
+++ b/tf_config/corstone700-error-deprecated
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_LINUX_KERNEL_AS_BL33=1
+ARM_PRELOADED_DTB_BASE=0x02800000
+CROSS_COMPILE=arm-none-eabi-
+ERROR_DEPRECATED=1
+PLAT=corstone700
+PRELOADED_BL33_BASE=0x08500000
+RESET_TO_SP_MIN=1
diff --git a/tf_config/corstone700-fpga-default b/tf_config/corstone700-fpga-default
new file mode 100644
index 0000000..d7d37ea
--- /dev/null
+++ b/tf_config/corstone700-fpga-default
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_LINUX_KERNEL_AS_BL33=0
+ARM_PRELOADED_DTB_BASE=0x80400000
+CROSS_COMPILE=arm-none-eabi-
+ENABLE_PIE=1
+PLAT=corstone700
+RESET_TO_SP_MIN=1
+TARGET_PLATFORM=fpga
\ No newline at end of file
diff --git a/tf_config/corstone700-fvp-default b/tf_config/corstone700-fvp-default
new file mode 100644
index 0000000..c360b31
--- /dev/null
+++ b/tf_config/corstone700-fvp-default
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_LINUX_KERNEL_AS_BL33=0
+ARM_PRELOADED_DTB_BASE=0x80400000
+CROSS_COMPILE=arm-none-eabi-
+ENABLE_PIE=1
+PLAT=corstone700
+RESET_TO_SP_MIN=1
+TARGET_PLATFORM=fvp
\ No newline at end of file
diff --git a/tf_config/fvp-aarch32-bl2-el3 b/tf_config/fvp-aarch32-bl2-el3
new file mode 100644
index 0000000..1cc311f
--- /dev/null
+++ b/tf_config/fvp-aarch32-bl2-el3
@@ -0,0 +1,5 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+BL2_AT_EL3=1
+CROSS_COMPILE=arm-none-eabi-
+PLAT=fvp
diff --git a/tf_config/fvp-aarch32-default b/tf_config/fvp-aarch32-default
index c2f6328..ad48e3c 100644
--- a/tf_config/fvp-aarch32-default
+++ b/tf_config/fvp-aarch32-default
@@ -1,4 +1,4 @@
 AARCH32_SP=sp_min
 ARCH=aarch32
-CROSS_COMPILE=arm-linux-gnueabihf-
+CROSS_COMPILE=arm-none-eabi-
 PLAT=fvp
diff --git a/tf_config/fvp-aarch32-enable-runtime-instr b/tf_config/fvp-aarch32-enable-runtime-instr
new file mode 100644
index 0000000..ec7b40f
--- /dev/null
+++ b/tf_config/fvp-aarch32-enable-runtime-instr
@@ -0,0 +1,5 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+ENABLE_RUNTIME_INSTRUMENTATION=1
+PLAT=fvp
diff --git a/tf_config/fvp-aarch32-gicv2 b/tf_config/fvp-aarch32-gicv2
new file mode 100644
index 0000000..5a1fbca
--- /dev/null
+++ b/tf_config/fvp-aarch32-gicv2
@@ -0,0 +1,5 @@
+AARCH32_SP=sp_min
+CROSS_COMPILE=arm-none-eabi-
+FVP_USE_GIC_DRIVER=FVP_GICV2
+ARCH=aarch32
+PLAT=fvp
diff --git a/tf_config/fvp-aarch32-roxlattables b/tf_config/fvp-aarch32-roxlattables
new file mode 100644
index 0000000..22d2920
--- /dev/null
+++ b/tf_config/fvp-aarch32-roxlattables
@@ -0,0 +1,5 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=fvp
+ALLOW_RO_XLAT_TABLES=1
diff --git a/tf_config/fvp-aarch32-rst-to-sp-min b/tf_config/fvp-aarch32-rst-to-sp-min
new file mode 100644
index 0000000..e0cea76
--- /dev/null
+++ b/tf_config/fvp-aarch32-rst-to-sp-min
@@ -0,0 +1,5 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=fvp
+RESET_TO_SP_MIN=1
diff --git a/tf_config/fvp-aarch32-sec-int-fconf b/tf_config/fvp-aarch32-sec-int-fconf
new file mode 100644
index 0000000..eb55bd2
--- /dev/null
+++ b/tf_config/fvp-aarch32-sec-int-fconf
@@ -0,0 +1,5 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=fvp
+SEC_INT_DESC_IN_FCONF=1
diff --git a/tf_config/fvp-aarch32-stack-protector b/tf_config/fvp-aarch32-stack-protector
new file mode 100644
index 0000000..eaaa241
--- /dev/null
+++ b/tf_config/fvp-aarch32-stack-protector
@@ -0,0 +1,5 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+ENABLE_STACK_PROTECTOR=all
+PLAT=fvp
diff --git a/tf_config/fvp-aarch32-tbb-mbedtls b/tf_config/fvp-aarch32-tbb-mbedtls
new file mode 100644
index 0000000..917d714
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-mbedtls
@@ -0,0 +1,8 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-aarch32-tbb-mbedtls-bl2-el3 b/tf_config/fvp-aarch32-tbb-mbedtls-bl2-el3
new file mode 100644
index 0000000..889a16e
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-mbedtls-bl2-el3
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+BL2_AT_EL3=1
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-aarch32-tbb-mbedtls-dualroot b/tf_config/fvp-aarch32-tbb-mbedtls-dualroot
new file mode 100644
index 0000000..7df6658
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-mbedtls-dualroot
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=arm-none-eabi-
+COT=dualroot
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-aarch32-tbb-mbedtls-ecdsa b/tf_config/fvp-aarch32-tbb-mbedtls-ecdsa
new file mode 100644
index 0000000..1f39531
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-mbedtls-ecdsa
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert b/tf_config/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
new file mode 100644
index 0000000..3844497
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
@@ -0,0 +1,10 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+KEY_ALG=rsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-aarch32-xlat-lib-v1 b/tf_config/fvp-aarch32-xlat-lib-v1
new file mode 100644
index 0000000..865b09e
--- /dev/null
+++ b/tf_config/fvp-aarch32-xlat-lib-v1
@@ -0,0 +1,6 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_XLAT_TABLES_LIB_V1=1
+RECLAIM_INIT_CODE=0
+CROSS_COMPILE=arm-none-eabi-
+PLAT=fvp
diff --git a/tf_config/fvp-aarch64-roxlattables b/tf_config/fvp-aarch64-roxlattables
new file mode 100644
index 0000000..9377bbf
--- /dev/null
+++ b/tf_config/fvp-aarch64-roxlattables
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+ALLOW_RO_XLAT_TABLES=1
diff --git a/tf_config/fvp-aarch64-roxlattables-tspd b/tf_config/fvp-aarch64-roxlattables-tspd
new file mode 100644
index 0000000..8ff7c29
--- /dev/null
+++ b/tf_config/fvp-aarch64-roxlattables-tspd
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+ALLOW_RO_XLAT_TABLES=1
+SPD=tspd
diff --git a/tf_config/fvp-aarch64-sdei b/tf_config/fvp-aarch64-sdei
new file mode 100644
index 0000000..3182ecc
--- /dev/null
+++ b/tf_config/fvp-aarch64-sdei
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+PLAT=fvp
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-aarch64-sdei-cc b/tf_config/fvp-aarch64-sdei-cc
new file mode 100644
index 0000000..c98dfbf
--- /dev/null
+++ b/tf_config/fvp-aarch64-sdei-cc
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+ENABLE_ASSERTIONS=0
+PLAT=fvp
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-aarch64-sdei-fconf b/tf_config/fvp-aarch64-sdei-fconf
new file mode 100644
index 0000000..4e06382
--- /dev/null
+++ b/tf_config/fvp-aarch64-sdei-fconf
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+PLAT=fvp
+SDEI_SUPPORT=1
+SDEI_IN_FCONF=1
diff --git a/tf_config/fvp-aarch64-sec-int-fconf b/tf_config/fvp-aarch64-sec-int-fconf
new file mode 100644
index 0000000..c991aa0
--- /dev/null
+++ b/tf_config/fvp-aarch64-sec-int-fconf
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SEC_INT_DESC_IN_FCONF=1
diff --git a/tf_config/fvp-aarch64-stack-protector b/tf_config/fvp-aarch64-stack-protector
new file mode 100644
index 0000000..19f8a20
--- /dev/null
+++ b/tf_config/fvp-aarch64-stack-protector
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_STACK_PROTECTOR=all
+RECLAIM_INIT_CODE=0
+PLAT=fvp
diff --git a/tf_config/fvp-arm-bl31-in-dram b/tf_config/fvp-arm-bl31-in-dram
new file mode 100644
index 0000000..33ea953
--- /dev/null
+++ b/tf_config/fvp-arm-bl31-in-dram
@@ -0,0 +1,3 @@
+ARM_BL31_IN_DRAM=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
diff --git a/tf_config/fvp-bl2-el3 b/tf_config/fvp-bl2-el3
new file mode 100644
index 0000000..011094b
--- /dev/null
+++ b/tf_config/fvp-bl2-el3
@@ -0,0 +1,3 @@
+BL2_AT_EL3=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
diff --git a/tf_config/fvp-bl31-separate-nobits b/tf_config/fvp-bl31-separate-nobits
new file mode 100644
index 0000000..c250233
--- /dev/null
+++ b/tf_config/fvp-bl31-separate-nobits
@@ -0,0 +1,5 @@
+ARM_BL31_IN_DRAM=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+RECLAIM_INIT_CODE=0
+SEPARATE_NOBITS_REGION=1
diff --git a/tf_config/fvp-boot-el3-payload b/tf_config/fvp-boot-el3-payload
new file mode 100644
index 0000000..f1fe4c4
--- /dev/null
+++ b/tf_config/fvp-boot-el3-payload
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_PAYLOAD_BASE=0x80000000
+PLAT=fvp
diff --git a/tf_config/fvp-cas-spinlock b/tf_config/fvp-cas-spinlock
new file mode 100644
index 0000000..1614da4
--- /dev/null
+++ b/tf_config/fvp-cas-spinlock
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+ARM_ARCH_MINOR=3
+USE_SPINLOCK_CAS=1
diff --git a/tf_config/fvp-crash-report b/tf_config/fvp-crash-report
new file mode 100644
index 0000000..b9e7706
--- /dev/null
+++ b/tf_config/fvp-crash-report
@@ -0,0 +1,8 @@
+CRASH_REPORTING=1
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+ENABLE_BACKTRACE=1
+FAULT_INJECTION_SUPPORT=1
+HANDLE_EA_EL3_FIRST=1
+PLAT=fvp
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-debugfs b/tf_config/fvp-debugfs
new file mode 100644
index 0000000..4bb320e
--- /dev/null
+++ b/tf_config/fvp-debugfs
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+USE_DEBUGFS=1
diff --git a/tf_config/fvp-default b/tf_config/fvp-default
index 1e9dfe2..050637b 100644
--- a/tf_config/fvp-default
+++ b/tf_config/fvp-default
@@ -1,2 +1,2 @@
-CROSS_COMPILE=aarch64-linux-gnu-
+CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
diff --git a/tf_config/fvp-default-armclang b/tf_config/fvp-default-armclang
new file mode 100644
index 0000000..5132bb0
--- /dev/null
+++ b/tf_config/fvp-default-armclang
@@ -0,0 +1,3 @@
+CC=/arm/warehouse/Distributions/FA/ARMCompiler/6.8/25/standalone-linux-x86_64-rel/bin/armclang
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
diff --git a/tf_config/fvp-default-cc b/tf_config/fvp-default-cc
new file mode 100644
index 0000000..1247532
--- /dev/null
+++ b/tf_config/fvp-default-cc
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+PLAT=fvp
diff --git a/tf_config/fvp-default-clang b/tf_config/fvp-default-clang
new file mode 100644
index 0000000..7e39698
--- /dev/null
+++ b/tf_config/fvp-default-clang
@@ -0,0 +1,3 @@
+CC=clang
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
diff --git a/tf_config/fvp-default-clang-bfd b/tf_config/fvp-default-clang-bfd
new file mode 100644
index 0000000..b460c11
--- /dev/null
+++ b/tf_config/fvp-default-clang-bfd
@@ -0,0 +1,4 @@
+CC=clang
+CROSS_COMPILE=aarch64-none-elf-
+LD=aarch64-none-elf-ld.bfd
+PLAT=fvp
diff --git a/tf_config/fvp-dynamiq b/tf_config/fvp-dynamiq
new file mode 100644
index 0000000..d3d4112
--- /dev/null
+++ b/tf_config/fvp-dynamiq
@@ -0,0 +1,6 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_CLUSTER_COUNT=1
+FVP_MAX_CPUS_PER_CLUSTER=8
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-dynamiq-aarch64-only b/tf_config/fvp-dynamiq-aarch64-only
new file mode 100644
index 0000000..637a3c1
--- /dev/null
+++ b/tf_config/fvp-dynamiq-aarch64-only
@@ -0,0 +1,7 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+FVP_CLUSTER_COUNT=1
+FVP_MAX_CPUS_PER_CLUSTER=8
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-dynamiq-aarch64-only-2t b/tf_config/fvp-dynamiq-aarch64-only-2t
new file mode 100644
index 0000000..6ff75cd
--- /dev/null
+++ b/tf_config/fvp-dynamiq-aarch64-only-2t
@@ -0,0 +1,8 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+FVP_CLUSTER_COUNT=1
+FVP_MAX_CPUS_PER_CLUSTER=4
+FVP_MAX_PE_PER_CPU=2
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t b/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t
new file mode 100644
index 0000000..2683091
--- /dev/null
+++ b/tf_config/fvp-dynamiq-aarch64-only-8_2-1x2t
@@ -0,0 +1,10 @@
+ARM_ARCH_MINOR=2
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+FVP_CLUSTER_COUNT=1
+FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-dynamiq-2t.dts
+FVP_MAX_CPUS_PER_CLUSTER=1
+FVP_MAX_PE_PER_CPU=2
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-dynamiq-aarch64-only-8_2-2x2t b/tf_config/fvp-dynamiq-aarch64-only-8_2-2x2t
new file mode 100644
index 0000000..d8bb4f4
--- /dev/null
+++ b/tf_config/fvp-dynamiq-aarch64-only-8_2-2x2t
@@ -0,0 +1,10 @@
+ARM_ARCH_MINOR=2
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+FVP_CLUSTER_COUNT=1
+FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-dynamiq-2t.dts
+FVP_MAX_CPUS_PER_CLUSTER=2
+FVP_MAX_PE_PER_CPU=2
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-dynamiq-aarch64-only-8_2-4x2t b/tf_config/fvp-dynamiq-aarch64-only-8_2-4x2t
new file mode 100644
index 0000000..7c9fcfa
--- /dev/null
+++ b/tf_config/fvp-dynamiq-aarch64-only-8_2-4x2t
@@ -0,0 +1,10 @@
+ARM_ARCH_MINOR=2
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+FVP_CLUSTER_COUNT=1
+FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-dynamiq-2t.dts
+FVP_MAX_CPUS_PER_CLUSTER=4
+FVP_MAX_PE_PER_CPU=2
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-dynamiq-aarch64-only-8x2t b/tf_config/fvp-dynamiq-aarch64-only-8x2t
new file mode 100644
index 0000000..2c7445c
--- /dev/null
+++ b/tf_config/fvp-dynamiq-aarch64-only-8x2t
@@ -0,0 +1,8 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+FVP_CLUSTER_COUNT=1
+FVP_MAX_CPUS_PER_CLUSTER=8
+FVP_MAX_PE_PER_CPU=2
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-early-d-cache b/tf_config/fvp-early-d-cache
new file mode 100644
index 0000000..ab0aa61
--- /dev/null
+++ b/tf_config/fvp-early-d-cache
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+WARMBOOT_ENABLE_DCACHE_EARLY=1
diff --git a/tf_config/fvp-enable-runtime-instr b/tf_config/fvp-enable-runtime-instr
new file mode 100644
index 0000000..e57bb87
--- /dev/null
+++ b/tf_config/fvp-enable-runtime-instr
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_RUNTIME_INSTRUMENTATION=1
+PLAT=fvp
diff --git a/tf_config/fvp-enable-runtime-instr-cc b/tf_config/fvp-enable-runtime-instr-cc
new file mode 100644
index 0000000..7a30c8b
--- /dev/null
+++ b/tf_config/fvp-enable-runtime-instr-cc
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+ENABLE_RUNTIME_INSTRUMENTATION=1
+PLAT=fvp
diff --git a/tf_config/fvp-error-deprecated b/tf_config/fvp-error-deprecated
new file mode 100644
index 0000000..5a73db8
--- /dev/null
+++ b/tf_config/fvp-error-deprecated
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERROR_DEPRECATED=1
+PLAT=fvp
diff --git a/tf_config/fvp-ext-pstate-ea-el3 b/tf_config/fvp-ext-pstate-ea-el3
new file mode 100644
index 0000000..22919b9
--- /dev/null
+++ b/tf_config/fvp-ext-pstate-ea-el3
@@ -0,0 +1,5 @@
+ARM_RECOM_STATE_ID_ENC=1
+CROSS_COMPILE=aarch64-none-elf-
+HANDLE_EA_EL3_FIRST=1
+PLAT=fvp
+PSCI_EXTENDED_STATE_ID=1
diff --git a/tf_config/fvp-ext-pstate-ea-el3-cc b/tf_config/fvp-ext-pstate-ea-el3-cc
new file mode 100644
index 0000000..e02819c
--- /dev/null
+++ b/tf_config/fvp-ext-pstate-ea-el3-cc
@@ -0,0 +1,6 @@
+ARM_RECOM_STATE_ID_ENC=1
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+HANDLE_EA_EL3_FIRST=1
+PLAT=fvp
+PSCI_EXTENDED_STATE_ID=1
diff --git a/tf_config/fvp-gcc-lto b/tf_config/fvp-gcc-lto
new file mode 100644
index 0000000..0f0ca36
--- /dev/null
+++ b/tf_config/fvp-gcc-lto
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_LTO=1
+PLAT=fvp
+
diff --git a/tf_config/fvp-gicv4 b/tf_config/fvp-gicv4
new file mode 100644
index 0000000..cffd893
--- /dev/null
+++ b/tf_config/fvp-gicv4
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+GIC_ENABLE_V4_EXTN=1
+GIC_EXT_INTID=1
+PLAT=fvp
diff --git a/tf_config/fvp-hw-assisted-coherency b/tf_config/fvp-hw-assisted-coherency
new file mode 100644
index 0000000..8c6e806
--- /dev/null
+++ b/tf_config/fvp-hw-assisted-coherency
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-misc-features b/tf_config/fvp-misc-features
new file mode 100644
index 0000000..3706431
--- /dev/null
+++ b/tf_config/fvp-misc-features
@@ -0,0 +1,4 @@
+ARM_ARCH_MINOR=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_FPREGS=1
+PLAT=fvp
diff --git a/tf_config/fvp-mte-tsp b/tf_config/fvp-mte-tsp
new file mode 100644
index 0000000..7b4c14a
--- /dev/null
+++ b/tf_config/fvp-mte-tsp
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_MTE_REGS=1
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-no-cohmem b/tf_config/fvp-no-cohmem
new file mode 100644
index 0000000..4dcf796
--- /dev/null
+++ b/tf_config/fvp-no-cohmem
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-no-cohmem-cc b/tf_config/fvp-no-cohmem-cc
new file mode 100644
index 0000000..f4417b3
--- /dev/null
+++ b/tf_config/fvp-no-cohmem-cc
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-no-cohmem-crash-report b/tf_config/fvp-no-cohmem-crash-report
new file mode 100644
index 0000000..9ea4168
--- /dev/null
+++ b/tf_config/fvp-no-cohmem-crash-report
@@ -0,0 +1,5 @@
+ASM_ASSERTION=1
+CRASH_REPORTING=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-no-optimize-default b/tf_config/fvp-no-optimize-default
new file mode 100644
index 0000000..77881da
--- /dev/null
+++ b/tf_config/fvp-no-optimize-default
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+ARM_BL31_IN_DRAM=1
+LOG_LEVEL=20
+CFLAGS='-O0'
diff --git a/tf_config/fvp-optee-as-spm b/tf_config/fvp-optee-as-spm
new file mode 100644
index 0000000..9eed0c6
--- /dev/null
+++ b/tf_config/fvp-optee-as-spm
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=spmd
+SPMD_SPM_AT_SEL2=0
diff --git a/tf_config/fvp-opteed b/tf_config/fvp-opteed
new file mode 100644
index 0000000..9b56458
--- /dev/null
+++ b/tf_config/fvp-opteed
@@ -0,0 +1,4 @@
+ARM_TSP_RAM_LOCATION=tdram
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=opteed
diff --git a/tf_config/fvp-opteed-cc b/tf_config/fvp-opteed-cc
new file mode 100644
index 0000000..39dfc3d
--- /dev/null
+++ b/tf_config/fvp-opteed-cc
@@ -0,0 +1,5 @@
+ARM_TSP_RAM_LOCATION=tdram
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+PLAT=fvp
+SPD=opteed
diff --git a/tf_config/fvp-pauth-ctx b/tf_config/fvp-pauth-ctx
new file mode 100644
index 0000000..742dc60
--- /dev/null
+++ b/tf_config/fvp-pauth-ctx
@@ -0,0 +1,6 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+CTX_INCLUDE_PAUTH_REGS=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-ctx-tsp b/tf_config/fvp-pauth-ctx-tsp
new file mode 100644
index 0000000..cc82744
--- /dev/null
+++ b/tf_config/fvp-pauth-ctx-tsp
@@ -0,0 +1,8 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+CTX_INCLUDE_PAUTH_REGS=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
+SPD=tspd
+TSP_NS_INTR_ASYNC_PREEMPT=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-pac-ret b/tf_config/fvp-pauth-pac-ret
new file mode 100644
index 0000000..b78c60a
--- /dev/null
+++ b/tf_config/fvp-pauth-pac-ret
@@ -0,0 +1,7 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=2
+CTX_INCLUDE_PAUTH_REGS=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-pac-ret-leaf b/tf_config/fvp-pauth-pac-ret-leaf
new file mode 100644
index 0000000..f392e0e
--- /dev/null
+++ b/tf_config/fvp-pauth-pac-ret-leaf
@@ -0,0 +1,7 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=3
+CTX_INCLUDE_PAUTH_REGS=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-pac-ret-leaf-tsp b/tf_config/fvp-pauth-pac-ret-leaf-tsp
new file mode 100644
index 0000000..b4b0442
--- /dev/null
+++ b/tf_config/fvp-pauth-pac-ret-leaf-tsp
@@ -0,0 +1,9 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=3
+CTX_INCLUDE_PAUTH_REGS=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
+SPD=tspd
+TSP_NS_INTR_ASYNC_PREEMPT=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-pac-ret-tsp b/tf_config/fvp-pauth-pac-ret-tsp
new file mode 100644
index 0000000..3d19c2e
--- /dev/null
+++ b/tf_config/fvp-pauth-pac-ret-tsp
@@ -0,0 +1,9 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=2
+CTX_INCLUDE_PAUTH_REGS=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
+SPD=tspd
+TSP_NS_INTR_ASYNC_PREEMPT=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-standard b/tf_config/fvp-pauth-standard
new file mode 100644
index 0000000..71d508c
--- /dev/null
+++ b/tf_config/fvp-pauth-standard
@@ -0,0 +1,7 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=1
+CTX_INCLUDE_PAUTH_REGS=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-standard-romlib b/tf_config/fvp-pauth-standard-romlib
new file mode 100644
index 0000000..3c8f8be
--- /dev/null
+++ b/tf_config/fvp-pauth-standard-romlib
@@ -0,0 +1,10 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=1
+CTX_INCLUDE_PAUTH_REGS=1
+ARM_ROTPK_LOCATION=devel_rsa
+GENERATE_COT=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-standard-tsp b/tf_config/fvp-pauth-standard-tsp
new file mode 100644
index 0000000..b9d2bc6
--- /dev/null
+++ b/tf_config/fvp-pauth-standard-tsp
@@ -0,0 +1,9 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=1
+CTX_INCLUDE_PAUTH_REGS=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
+SPD=tspd
+TSP_NS_INTR_ASYNC_PREEMPT=1
+PLAT=fvp
diff --git a/tf_config/fvp-pauth-standard-tsp-romlib b/tf_config/fvp-pauth-standard-tsp-romlib
new file mode 100644
index 0000000..e491662
--- /dev/null
+++ b/tf_config/fvp-pauth-standard-tsp-romlib
@@ -0,0 +1,12 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=1
+CTX_INCLUDE_PAUTH_REGS=1
+SPD=tspd
+TSP_NS_INTR_ASYNC_PREEMPT=1
+ARM_ROTPK_LOCATION=devel_rsa
+GENERATE_COT=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
+PLAT=fvp
diff --git a/tf_config/fvp-pl33 b/tf_config/fvp-pl33
new file mode 100644
index 0000000..240e409
--- /dev/null
+++ b/tf_config/fvp-pl33
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+PRELOADED_BL33_BASE=0x88000000
diff --git a/tf_config/fvp-pl33-cc b/tf_config/fvp-pl33-cc
new file mode 100644
index 0000000..1bc344c
--- /dev/null
+++ b/tf_config/fvp-pl33-cc
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+PLAT=fvp
+PRELOADED_BL33_BASE=0x88000000
diff --git a/tf_config/fvp-ras-fault-inject b/tf_config/fvp-ras-fault-inject
new file mode 100644
index 0000000..35bb31e
--- /dev/null
+++ b/tf_config/fvp-ras-fault-inject
@@ -0,0 +1,7 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+FAULT_INJECTION_SUPPORT=1
+HANDLE_EA_EL3_FIRST=1
+PLAT=fvp
+RAS_EXTENSION=1
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-rde1edge-error-deprecated b/tf_config/fvp-rde1edge-error-deprecated
new file mode 100644
index 0000000..f002e3b
--- /dev/null
+++ b/tf_config/fvp-rde1edge-error-deprecated
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERROR_DEPRECATED=1
+PLAT=rde1edge
diff --git a/tf_config/fvp-rde1edge-tbb b/tf_config/fvp-rde1edge-tbb
new file mode 100644
index 0000000..9c99784
--- /dev/null
+++ b/tf_config/fvp-rde1edge-tbb
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=rde1edge
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-rde1edge-tbb-dualroot b/tf_config/fvp-rde1edge-tbb-dualroot
new file mode 100644
index 0000000..f2e7db2
--- /dev/null
+++ b/tf_config/fvp-rde1edge-tbb-dualroot
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=dualroot
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=rde1edge
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-rdn1edge-error-deprecated b/tf_config/fvp-rdn1edge-error-deprecated
new file mode 100644
index 0000000..330cd7f
--- /dev/null
+++ b/tf_config/fvp-rdn1edge-error-deprecated
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERROR_DEPRECATED=1
+PLAT=rdn1edge
diff --git a/tf_config/fvp-rdn1edge-tbb b/tf_config/fvp-rdn1edge-tbb
new file mode 100644
index 0000000..d07bc7e
--- /dev/null
+++ b/tf_config/fvp-rdn1edge-tbb
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=rdn1edge
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-rdn1edge-tbb-dualroot b/tf_config/fvp-rdn1edge-tbb-dualroot
new file mode 100644
index 0000000..5cdf8e4
--- /dev/null
+++ b/tf_config/fvp-rdn1edge-tbb-dualroot
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=dualroot
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=rdn1edge
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-rst-bl31 b/tf_config/fvp-rst-bl31
new file mode 100644
index 0000000..49322ce
--- /dev/null
+++ b/tf_config/fvp-rst-bl31
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+RESET_TO_BL31=1
diff --git a/tf_config/fvp-sgi575-error-deprecated b/tf_config/fvp-sgi575-error-deprecated
new file mode 100644
index 0000000..201facd
--- /dev/null
+++ b/tf_config/fvp-sgi575-error-deprecated
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERROR_DEPRECATED=1
+PLAT=sgi575
diff --git a/tf_config/fvp-sgi575-tbb b/tf_config/fvp-sgi575-tbb
new file mode 100644
index 0000000..7278fa3
--- /dev/null
+++ b/tf_config/fvp-sgi575-tbb
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=sgi575
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-sgi575-tbb-dualroot b/tf_config/fvp-sgi575-tbb-dualroot
new file mode 100644
index 0000000..25c766f
--- /dev/null
+++ b/tf_config/fvp-sgi575-tbb-dualroot
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=dualroot
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=sgi575
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-sgm775 b/tf_config/fvp-sgm775
new file mode 100644
index 0000000..19fd765
--- /dev/null
+++ b/tf_config/fvp-sgm775
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+PLAT=sgm775
diff --git a/tf_config/fvp-sgm775-error-deprecated b/tf_config/fvp-sgm775-error-deprecated
new file mode 100644
index 0000000..c06629c
--- /dev/null
+++ b/tf_config/fvp-sgm775-error-deprecated
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+ERROR_DEPRECATED=1
+PLAT=sgm775
diff --git a/tf_config/fvp-sgm775-tbb b/tf_config/fvp-sgm775-tbb
new file mode 100644
index 0000000..3cb0c93
--- /dev/null
+++ b/tf_config/fvp-sgm775-tbb
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+GENERATE_COT=1
+PLAT=sgm775
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SCP_BL2=/dev/null
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-sgm775-tbb-dualroot b/tf_config/fvp-sgm775-tbb-dualroot
new file mode 100644
index 0000000..5e4f47f
--- /dev/null
+++ b/tf_config/fvp-sgm775-tbb-dualroot
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=dualroot
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+GENERATE_COT=1
+PLAT=sgm775
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SCP_BL2=/dev/null
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-spm b/tf_config/fvp-spm
new file mode 100644
index 0000000..cf4878d
--- /dev/null
+++ b/tf_config/fvp-spm
@@ -0,0 +1,7 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=spmd
+SPMD_SPM_AT_SEL2=1
+CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MINOR=4
+SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-mm b/tf_config/fvp-spm-mm
new file mode 100644
index 0000000..9a79384
--- /dev/null
+++ b/tf_config/fvp-spm-mm
@@ -0,0 +1,5 @@
+ARM_BL31_IN_DRAM=1
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+SPM_MM=1
+PLAT=fvp
diff --git a/tf_config/fvp-spm-mm-cc b/tf_config/fvp-spm-mm-cc
new file mode 100644
index 0000000..b0e5a35
--- /dev/null
+++ b/tf_config/fvp-spm-mm-cc
@@ -0,0 +1,6 @@
+ARM_BL31_IN_DRAM=1
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+ENABLE_ASSERTIONS=0
+SPM_MM=1
+PLAT=fvp
diff --git a/tf_config/fvp-spm-tbb b/tf_config/fvp-spm-tbb
new file mode 100644
index 0000000..b350626
--- /dev/null
+++ b/tf_config/fvp-spm-tbb
@@ -0,0 +1,11 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=spmd
+SPMD_SPM_AT_SEL2=1
+CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MINOR=4
+SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+ARM_ROTPK_LOCATION=devel_rsa
+GENERATE_COT=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-spm-tbb-dualroot b/tf_config/fvp-spm-tbb-dualroot
new file mode 100644
index 0000000..716e66b
--- /dev/null
+++ b/tf_config/fvp-spm-tbb-dualroot
@@ -0,0 +1,12 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=spmd
+SPMD_SPM_AT_SEL2=1
+CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MINOR=4
+SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+ARM_ROTPK_LOCATION=devel_rsa
+GENERATE_COT=1
+COT=dualroot
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls b/tf_config/fvp-tbb-mbedtls
new file mode 100644
index 0000000..8a40e81
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls
@@ -0,0 +1,6 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-bl2-el3 b/tf_config/fvp-tbb-mbedtls-bl2-el3
new file mode 100644
index 0000000..7b461d4
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-bl2-el3
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+BL2_AT_EL3=1
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-ecdsa b/tf_config/fvp-tbb-mbedtls-ecdsa
new file mode 100644
index 0000000..a5ecfdc
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-ecdsa
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-ecdsa-sha512 b/tf_config/fvp-tbb-mbedtls-ecdsa-sha512
new file mode 100644
index 0000000..7c6b383
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-ecdsa-sha512
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+HASH_ALG=sha512
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-no-cohmem b/tf_config/fvp-tbb-mbedtls-no-cohmem
new file mode 100644
index 0000000..7c49de6
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-no-cohmem
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-tbb-mbedtls-romlib b/tf_config/fvp-tbb-mbedtls-romlib
new file mode 100644
index 0000000..b7d8162
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-romlib
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tbb-mbedtls-romlib-sdei b/tf_config/fvp-tbb-mbedtls-romlib-sdei
new file mode 100644
index 0000000..c5071c2
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-romlib-sdei
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
+EL3_EXCEPTION_HANDLING=1
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rsa-3k-cert b/tf_config/fvp-tbb-mbedtls-rsa-3k-cert
new file mode 100644
index 0000000..9feae13
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-rsa-3k-cert
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+KEY_SIZE=3072
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rsa-4k-cert b/tf_config/fvp-tbb-mbedtls-rsa-4k-cert
new file mode 100644
index 0000000..06f7971
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-rsa-4k-cert
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+KEY_SIZE=4096
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert b/tf_config/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
new file mode 100644
index 0000000..45d3d16
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert b/tf_config/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert
new file mode 100644
index 0000000..7b152cb
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=ecdsa
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-tsp-async b/tf_config/fvp-tbb-mbedtls-tsp-async
new file mode 100644
index 0000000..92d1c16
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-tsp-async
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_INIT_ASYNC=1
diff --git a/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3 b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3
new file mode 100644
index 0000000..0ada492
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+NS_TIMER_SWITCH=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_INIT_ASYNC=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
diff --git a/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem
new file mode 100644
index 0000000..2305555
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+NS_TIMER_SWITCH=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_INIT_ASYNC=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-tbb-mbedtls-upcounter b/tf_config/fvp-tbb-mbedtls-upcounter
new file mode 100644
index 0000000..05c03d6
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-upcounter
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TFW_NVCTR_VAL=32
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tc0-tbb b/tf_config/fvp-tc0-tbb
new file mode 100644
index 0000000..1e3ab65
--- /dev/null
+++ b/tf_config/fvp-tc0-tbb
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=tc0
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SCP_BL2=/dev/null
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-trustyd b/tf_config/fvp-trustyd
new file mode 100644
index 0000000..eec0075
--- /dev/null
+++ b/tf_config/fvp-trustyd
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=trusty
diff --git a/tf_config/fvp-trustyd-gensvc b/tf_config/fvp-trustyd-gensvc
new file mode 100644
index 0000000..60fd781
--- /dev/null
+++ b/tf_config/fvp-trustyd-gensvc
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=trusty
+TRUSTY_SPD_WITH_GENERIC_SERVICES=1
diff --git a/tf_config/fvp-tspd b/tf_config/fvp-tspd
new file mode 100644
index 0000000..bfe4e28
--- /dev/null
+++ b/tf_config/fvp-tspd
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-tspd-aarch64-only b/tf_config/fvp-tspd-aarch64-only
new file mode 100644
index 0000000..14eaede
--- /dev/null
+++ b/tf_config/fvp-tspd-aarch64-only
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-tspd-aarch64-only-with-nstimer b/tf_config/fvp-tspd-aarch64-only-with-nstimer
new file mode 100644
index 0000000..27b216e
--- /dev/null
+++ b/tf_config/fvp-tspd-aarch64-only-with-nstimer
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+NS_TIMER_SWITCH=1
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-tspd-cc b/tf_config/fvp-tspd-cc
new file mode 100644
index 0000000..1ec3ef5
--- /dev/null
+++ b/tf_config/fvp-tspd-cc
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-tspd-gicv2-symmetric-model b/tf_config/fvp-tspd-gicv2-symmetric-model
new file mode 100644
index 0000000..b8b86a3
--- /dev/null
+++ b/tf_config/fvp-tspd-gicv2-symmetric-model
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_USE_GIC_DRIVER=FVP_GICV2
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-tspd-irq2el3 b/tf_config/fvp-tspd-irq2el3
new file mode 100644
index 0000000..ffd62d1
--- /dev/null
+++ b/tf_config/fvp-tspd-irq2el3
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
+TSP_NS_INTR_ASYNC_PREEMPT=1
diff --git a/tf_config/fvp-tspd-quad-cluster b/tf_config/fvp-tspd-quad-cluster
new file mode 100644
index 0000000..dfa07df
--- /dev/null
+++ b/tf_config/fvp-tspd-quad-cluster
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_CLUSTER_COUNT=4
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-tspd-rst-bl31 b/tf_config/fvp-tspd-rst-bl31
new file mode 100644
index 0000000..4136b51
--- /dev/null
+++ b/tf_config/fvp-tspd-rst-bl31
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+RESET_TO_BL31=1
+SPD=tspd
diff --git a/tf_config/fvp-tspd-tbb-mbedtls b/tf_config/fvp-tspd-tbb-mbedtls
new file mode 100644
index 0000000..1544594
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-mbedtls
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-cc b/tf_config/fvp-tspd-tbb-mbedtls-cc
new file mode 100644
index 0000000..64a598b
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-mbedtls-cc
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-dualroot b/tf_config/fvp-tspd-tbb-mbedtls-dualroot
new file mode 100644
index 0000000..0cd52a5
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-mbedtls-dualroot
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=dualroot
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot b/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
new file mode 100644
index 0000000..2ed6144
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+COT=dualroot
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+SPD=tspd
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-pauth b/tf_config/fvp-tspd-tbb-mbedtls-pauth
new file mode 100644
index 0000000..78044e7
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-mbedtls-pauth
@@ -0,0 +1,11 @@
+ARM_ARCH_MINOR=5
+ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_PAUTH_REGS=1
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-pauth-cc b/tf_config/fvp-tspd-tbb-mbedtls-pauth-cc
new file mode 100644
index 0000000..7b4d333
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-mbedtls-pauth-cc
@@ -0,0 +1,11 @@
+ARM_ARCH_MINOR=5
+ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_PAUTH_REGS=1
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tspd-tsp-async b/tf_config/fvp-tspd-tsp-async
new file mode 100644
index 0000000..5ab6688
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-async
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
+TSP_INIT_ASYNC=1
diff --git a/tf_config/fvp-tspd-tsp-async-crash-report b/tf_config/fvp-tspd-tsp-async-crash-report
new file mode 100644
index 0000000..5861872
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-async-crash-report
@@ -0,0 +1,6 @@
+ASM_ASSERTION=1
+CRASH_REPORTING=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
+TSP_INIT_ASYNC=1
diff --git a/tf_config/fvp-tspd-tsp-async-ehf b/tf_config/fvp-tspd-tsp-async-ehf
new file mode 100644
index 0000000..1c45530
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-async-ehf
@@ -0,0 +1,6 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+PLAT=fvp
+SPD=tspd
+TSP_INIT_ASYNC=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
diff --git a/tf_config/fvp-tspd-tsp-async-irq2el3 b/tf_config/fvp-tspd-tsp-async-irq2el3
new file mode 100644
index 0000000..831a840
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-async-irq2el3
@@ -0,0 +1,6 @@
+CROSS_COMPILE=aarch64-none-elf-
+NS_TIMER_SWITCH=1
+PLAT=fvp
+SPD=tspd
+TSP_INIT_ASYNC=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
diff --git a/tf_config/fvp-tspd-tsp-async-irq2el3-no-cohmem b/tf_config/fvp-tspd-tsp-async-irq2el3-no-cohmem
new file mode 100644
index 0000000..b084c69
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-async-irq2el3-no-cohmem
@@ -0,0 +1,7 @@
+CROSS_COMPILE=aarch64-none-elf-
+NS_TIMER_SWITCH=1
+PLAT=fvp
+SPD=tspd
+TSP_INIT_ASYNC=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-tspd-tsp-dram b/tf_config/fvp-tspd-tsp-dram
new file mode 100644
index 0000000..7e60faf
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-dram
@@ -0,0 +1,4 @@
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-tspd-tsp-tdram b/tf_config/fvp-tspd-tsp-tdram
new file mode 100644
index 0000000..ce667d4
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-tdram
@@ -0,0 +1,4 @@
+ARM_TSP_RAM_LOCATION=tdram
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-ubsan b/tf_config/fvp-ubsan
new file mode 100644
index 0000000..8544b73
--- /dev/null
+++ b/tf_config/fvp-ubsan
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SANITIZE_UB=trap
\ No newline at end of file
diff --git a/tf_config/fvp-xlat-lib-v1 b/tf_config/fvp-xlat-lib-v1
new file mode 100644
index 0000000..47db444
--- /dev/null
+++ b/tf_config/fvp-xlat-lib-v1
@@ -0,0 +1,4 @@
+ARM_XLAT_TABLES_LIB_V1=1
+RECLAIM_INIT_CODE=0
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
diff --git a/tf_config/fvp_ve-a5 b/tf_config/fvp_ve-a5
new file mode 100644
index 0000000..2144369
--- /dev/null
+++ b/tf_config/fvp_ve-a5
@@ -0,0 +1,8 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+ARM_CORTEX_A5=yes
+ARM_XLAT_TABLES_LIB_V1=1
+CROSS_COMPILE=arm-none-eabi-
+FVP_HW_CONFIG_DTS=fdts/fvp-ve-Cortex-A5x1.dts
+PLAT=fvp_ve
diff --git a/tf_config/fvp_ve-a5-error-deprecated b/tf_config/fvp_ve-a5-error-deprecated
new file mode 100644
index 0000000..c1d04c9
--- /dev/null
+++ b/tf_config/fvp_ve-a5-error-deprecated
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+ARM_CORTEX_A5=yes
+ARM_XLAT_TABLES_LIB_V1=1
+CROSS_COMPILE=arm-none-eabi-
+ERROR_DEPRECATED=1
+FVP_HW_CONFIG_DTS=fdts/fvp-ve-Cortex-A5x1.dts
+PLAT=fvp_ve
diff --git a/tf_config/fvp_ve-a7 b/tf_config/fvp_ve-a7
new file mode 100644
index 0000000..848823f
--- /dev/null
+++ b/tf_config/fvp_ve-a7
@@ -0,0 +1,7 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+ARM_CORTEX_A7=yes
+CROSS_COMPILE=arm-none-eabi-
+FVP_HW_CONFIG_DTS=fdts/fvp-ve-Cortex-A7x1.dts
+PLAT=fvp_ve
diff --git a/tf_config/fvp_ve-a7-error-deprecated b/tf_config/fvp_ve-a7-error-deprecated
new file mode 100644
index 0000000..30d15d2
--- /dev/null
+++ b/tf_config/fvp_ve-a7-error-deprecated
@@ -0,0 +1,8 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+ARM_CORTEX_A7=yes
+CROSS_COMPILE=arm-none-eabi-
+ERROR_DEPRECATED=1
+FVP_HW_CONFIG_DTS=fdts/fvp-ve-Cortex-A7x1.dts
+PLAT=fvp_ve
diff --git a/tf_config/g12a-default b/tf_config/g12a-default
new file mode 100644
index 0000000..4d4d799
--- /dev/null
+++ b/tf_config/g12a-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=g12a
diff --git a/tf_config/gxbb-default b/tf_config/gxbb-default
new file mode 100644
index 0000000..4284a40
--- /dev/null
+++ b/tf_config/gxbb-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=gxbb
diff --git a/tf_config/gxl-default b/tf_config/gxl-default
new file mode 100644
index 0000000..dbd4e40
--- /dev/null
+++ b/tf_config/gxl-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=gxl
diff --git a/tf_config/hikey-default b/tf_config/hikey-default
new file mode 100644
index 0000000..9506310
--- /dev/null
+++ b/tf_config/hikey-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=hikey
diff --git a/tf_config/hikey-enable-pmf b/tf_config/hikey-enable-pmf
new file mode 100644
index 0000000..d7fb579
--- /dev/null
+++ b/tf_config/hikey-enable-pmf
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_PMF=1
+PLAT=hikey
diff --git a/tf_config/hikey-opteed b/tf_config/hikey-opteed
new file mode 100644
index 0000000..c3c2cc7
--- /dev/null
+++ b/tf_config/hikey-opteed
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=hikey
+SPD=opteed
diff --git a/tf_config/hikey960-default b/tf_config/hikey960-default
new file mode 100644
index 0000000..9ad78df
--- /dev/null
+++ b/tf_config/hikey960-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=hikey960
diff --git a/tf_config/hikey960-opteed b/tf_config/hikey960-opteed
new file mode 100644
index 0000000..5d62c0e
--- /dev/null
+++ b/tf_config/hikey960-opteed
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=hikey960
+SPD=opteed
diff --git a/tf_config/imx8mm-default b/tf_config/imx8mm-default
new file mode 100644
index 0000000..f8e12a1
--- /dev/null
+++ b/tf_config/imx8mm-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=imx8mm
diff --git a/tf_config/imx8mn-default b/tf_config/imx8mn-default
new file mode 100644
index 0000000..66391c6
--- /dev/null
+++ b/tf_config/imx8mn-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=imx8mn
diff --git a/tf_config/imx8mq-default b/tf_config/imx8mq-default
new file mode 100644
index 0000000..607ed90
--- /dev/null
+++ b/tf_config/imx8mq-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+LOG_LEVEL=20
+PLAT=imx8mq
diff --git a/tf_config/imx8qm-default b/tf_config/imx8qm-default
new file mode 100644
index 0000000..91b0647
--- /dev/null
+++ b/tf_config/imx8qm-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=imx8qm
diff --git a/tf_config/imx8qx-default b/tf_config/imx8qx-default
new file mode 100644
index 0000000..db5b778
--- /dev/null
+++ b/tf_config/imx8qx-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=imx8qx
diff --git a/tf_config/juno-aarch32-el3-runtime b/tf_config/juno-aarch32-el3-runtime
new file mode 100644
index 0000000..877067b
--- /dev/null
+++ b/tf_config/juno-aarch32-el3-runtime
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+JUNO_AARCH32_EL3_RUNTIME=1
+PLAT=juno
diff --git a/tf_config/juno-aarch32-el3-runtime-mbedtls b/tf_config/juno-aarch32-el3-runtime-mbedtls
new file mode 100644
index 0000000..9e10f01
--- /dev/null
+++ b/tf_config/juno-aarch32-el3-runtime-mbedtls
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+JUNO_AARCH32_EL3_RUNTIME=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-aarch32-rst-to-sp-min b/tf_config/juno-aarch32-rst-to-sp-min
new file mode 100644
index 0000000..d98313e
--- /dev/null
+++ b/tf_config/juno-aarch32-rst-to-sp-min
@@ -0,0 +1,6 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+JUNO_AARCH32_EL3_RUNTIME=1
+PLAT=juno
+RESET_TO_SP_MIN=1
diff --git a/tf_config/juno-aarch32-rst-to-sp-min-enable-runtime-instr b/tf_config/juno-aarch32-rst-to-sp-min-enable-runtime-instr
new file mode 100644
index 0000000..6489c83
--- /dev/null
+++ b/tf_config/juno-aarch32-rst-to-sp-min-enable-runtime-instr
@@ -0,0 +1,7 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+ENABLE_RUNTIME_INSTRUMENTATION=1
+JUNO_AARCH32_EL3_RUNTIME=1
+PLAT=juno
+RESET_TO_SP_MIN=1
diff --git a/tf_config/juno-aarch32-rst-to-sp-min-stack-protector b/tf_config/juno-aarch32-rst-to-sp-min-stack-protector
new file mode 100644
index 0000000..f9d1d87
--- /dev/null
+++ b/tf_config/juno-aarch32-rst-to-sp-min-stack-protector
@@ -0,0 +1,7 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+ENABLE_STACK_PROTECTOR=strong
+JUNO_AARCH32_EL3_RUNTIME=1
+PLAT=juno
+RESET_TO_SP_MIN=1
diff --git a/tf_config/juno-all-cpu-reset-ops b/tf_config/juno-all-cpu-reset-ops
new file mode 100644
index 0000000..fb01923
--- /dev/null
+++ b/tf_config/juno-all-cpu-reset-ops
@@ -0,0 +1,23 @@
+A53_DISABLE_NON_TEMPORAL_HINT=1
+A57_DISABLE_NON_TEMPORAL_HINT=1
+CROSS_COMPILE=aarch64-none-elf-
+ERRATA_A53_826319=1
+ERRATA_A53_835769=1
+ERRATA_A53_836870=1
+ERRATA_A53_843419=1
+ERRATA_A53_855873=1
+ERRATA_A57_806969=1
+ERRATA_A57_813419=1
+ERRATA_A57_813420=1
+ERRATA_A57_826974=1
+ERRATA_A57_826977=1
+ERRATA_A57_828024=1
+ERRATA_A57_829520=1
+ERRATA_A57_833471=1
+ERRATA_A57_859972=1
+ERRATA_A72_859971=1
+PLAT=juno
+SKIP_A57_L1_FLUSH_PWR_DWN=1
+SPD=tspd
+WORKAROUND_CVE_2017_5715=1
+WORKAROUND_CVE_2018_3639=1
diff --git a/tf_config/juno-boot-el3-payload b/tf_config/juno-boot-el3-payload
new file mode 100644
index 0000000..9df3c50
--- /dev/null
+++ b/tf_config/juno-boot-el3-payload
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_PAYLOAD_BASE=0x80000000
+PLAT=juno
+SPIN_ON_BL1_EXIT=1
diff --git a/tf_config/juno-default b/tf_config/juno-default
index b6d2605..67df331 100644
--- a/tf_config/juno-default
+++ b/tf_config/juno-default
@@ -1,2 +1,2 @@
-CROSS_COMPILE=aarch64-linux-gnu-
+CROSS_COMPILE=aarch64-none-elf-
 PLAT=juno
diff --git a/tf_config/juno-default-armclang b/tf_config/juno-default-armclang
new file mode 100644
index 0000000..bb229ea
--- /dev/null
+++ b/tf_config/juno-default-armclang
@@ -0,0 +1,3 @@
+CC=/arm/warehouse/Distributions/FA/ARMCompiler/6.8/25/standalone-linux-x86_64-rel/bin/armclang
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
diff --git a/tf_config/juno-default-clang b/tf_config/juno-default-clang
new file mode 100644
index 0000000..b5f67ff
--- /dev/null
+++ b/tf_config/juno-default-clang
@@ -0,0 +1,3 @@
+CC=clang
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
diff --git a/tf_config/juno-enable-runtime-instr b/tf_config/juno-enable-runtime-instr
new file mode 100644
index 0000000..f986665
--- /dev/null
+++ b/tf_config/juno-enable-runtime-instr
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_RUNTIME_INSTRUMENTATION=1
+PLAT=juno
diff --git a/tf_config/juno-error-deprecated b/tf_config/juno-error-deprecated
new file mode 100644
index 0000000..741888a
--- /dev/null
+++ b/tf_config/juno-error-deprecated
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERROR_DEPRECATED=1
+PLAT=juno
diff --git a/tf_config/juno-manual-extensive b/tf_config/juno-manual-extensive
new file mode 100644
index 0000000..a088b1a
--- /dev/null
+++ b/tf_config/juno-manual-extensive
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+SPD=tspd
diff --git a/tf_config/juno-manual-extensive-sdei b/tf_config/juno-manual-extensive-sdei
new file mode 100644
index 0000000..2e07d9d
--- /dev/null
+++ b/tf_config/juno-manual-extensive-sdei
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+EL3_EXCEPTION_HANDLING=1
+GICV2_G0_FOR_EL3=1
+SDEI_SUPPORT=1
diff --git a/tf_config/juno-mbedtls-ecdsa-opteed b/tf_config/juno-mbedtls-ecdsa-opteed
new file mode 100644
index 0000000..bfce55e
--- /dev/null
+++ b/tf_config/juno-mbedtls-ecdsa-opteed
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+ARM_TSP_RAM_LOCATION=dram
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-mbedtls-rsa-opteed b/tf_config/juno-mbedtls-rsa-opteed
new file mode 100644
index 0000000..208356e
--- /dev/null
+++ b/tf_config/juno-mbedtls-rsa-opteed
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=dram
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+GENERATE_COT=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-no-cohmem b/tf_config/juno-no-cohmem
new file mode 100644
index 0000000..d479c8b
--- /dev/null
+++ b/tf_config/juno-no-cohmem
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+USE_COHERENT_MEM=0
diff --git a/tf_config/juno-no-optimize-default b/tf_config/juno-no-optimize-default
new file mode 100644
index 0000000..40a25e1
--- /dev/null
+++ b/tf_config/juno-no-optimize-default
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+LOG_LEVEL=20
+CFLAGS='-O0'
diff --git a/tf_config/juno-no-scmi b/tf_config/juno-no-scmi
new file mode 100644
index 0000000..837d837
--- /dev/null
+++ b/tf_config/juno-no-scmi
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=0
+PLAT=juno
diff --git a/tf_config/juno-pl33 b/tf_config/juno-pl33
new file mode 100644
index 0000000..6c82ee6
--- /dev/null
+++ b/tf_config/juno-pl33
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+PRELOADED_BL33_BASE=0x88000000
diff --git a/tf_config/juno-sdei b/tf_config/juno-sdei
new file mode 100644
index 0000000..94f2f43
--- /dev/null
+++ b/tf_config/juno-sdei
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+SDEI_SUPPORT=1
+GICV2_G0_FOR_EL3=1
+EL3_EXCEPTION_HANDLING=1
diff --git a/tf_config/juno-stack-protector b/tf_config/juno-stack-protector
new file mode 100644
index 0000000..321509d
--- /dev/null
+++ b/tf_config/juno-stack-protector
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_STACK_PROTECTOR=strong
+PLAT=juno
+RECLAIM_INIT_CODE=0
diff --git a/tf_config/juno-tbb-cryptocell b/tf_config/juno-tbb-cryptocell
new file mode 100644
index 0000000..d5ef865
--- /dev/null
+++ b/tf_config/juno-tbb-cryptocell
@@ -0,0 +1,10 @@
+ARM_CRYPTOCELL_INTEG=1
+ARM_ROTPK_LOCATION=devel_rsa
+CCSBROM_LIB_PATH=/arm/projectscratch/ssg/trusted-fw/dummy-crypto-lib
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+KEY_SIZE=2048
diff --git a/tf_config/juno-tbb-mbedtls b/tf_config/juno-tbb-mbedtls
new file mode 100644
index 0000000..fe3b255
--- /dev/null
+++ b/tf_config/juno-tbb-mbedtls
@@ -0,0 +1,6 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-tbb-mbedtls-ecdsa b/tf_config/juno-tbb-mbedtls-ecdsa
new file mode 100644
index 0000000..585a1aa
--- /dev/null
+++ b/tf_config/juno-tbb-mbedtls-ecdsa
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-tbb-mbedtls-romlib b/tf_config/juno-tbb-mbedtls-romlib
new file mode 100644
index 0000000..c4767aa
--- /dev/null
+++ b/tf_config/juno-tbb-mbedtls-romlib
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/juno-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert b/tf_config/juno-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
new file mode 100644
index 0000000..956451a
--- /dev/null
+++ b/tf_config/juno-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+KEY_ALG=rsa
+LOG_LEVEL=20
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-tsp-no-cohmem-irq2el3 b/tf_config/juno-tsp-no-cohmem-irq2el3
new file mode 100644
index 0000000..549e425
--- /dev/null
+++ b/tf_config/juno-tsp-no-cohmem-irq2el3
@@ -0,0 +1,6 @@
+CROSS_COMPILE=aarch64-none-elf-
+NS_TIMER_SWITCH=1
+PLAT=juno
+SPD=tspd
+TSP_NS_INTR_ASYNC_PREEMPT=1
+USE_COHERENT_MEM=0
diff --git a/tf_config/juno-tspd b/tf_config/juno-tspd
new file mode 100644
index 0000000..a088b1a
--- /dev/null
+++ b/tf_config/juno-tspd
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+SPD=tspd
diff --git a/tf_config/juno-tspd-tbb-mbedtls b/tf_config/juno-tspd-tbb-mbedtls
new file mode 100644
index 0000000..af951f4
--- /dev/null
+++ b/tf_config/juno-tspd-tbb-mbedtls
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3 b/tf_config/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3
new file mode 100644
index 0000000..6253862
--- /dev/null
+++ b/tf_config/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+NS_TIMER_SWITCH=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
+USE_COHERENT_MEM=0
diff --git a/tf_config/juno-tspd-tsp-async-irq2el3-crash-report b/tf_config/juno-tspd-tsp-async-irq2el3-crash-report
new file mode 100644
index 0000000..e47695a
--- /dev/null
+++ b/tf_config/juno-tspd-tsp-async-irq2el3-crash-report
@@ -0,0 +1,8 @@
+ASM_ASSERTION=1
+CRASH_REPORTING=1
+CROSS_COMPILE=aarch64-none-elf-
+NS_TIMER_SWITCH=1
+PLAT=juno
+SPD=tspd
+TSP_INIT_ASYNC=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
diff --git a/tf_config/juno-tspd-tsp-dram b/tf_config/juno-tspd-tsp-dram
new file mode 100644
index 0000000..d874cae
--- /dev/null
+++ b/tf_config/juno-tspd-tsp-dram
@@ -0,0 +1,4 @@
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+SPD=tspd
diff --git a/tf_config/juno-tzmp-mbedtls-ecdsa-opteed b/tf_config/juno-tzmp-mbedtls-ecdsa-opteed
new file mode 100644
index 0000000..ae2040c
--- /dev/null
+++ b/tf_config/juno-tzmp-mbedtls-ecdsa-opteed
@@ -0,0 +1,12 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+ARM_TSP_RAM_LOCATION=dram
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+GENERATE_COT=1
+JUNO_TZMP1=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+SPD=opteed
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-tzmp-mbedtls-rsa-ecdsa-with-ecdsa-rotpk b/tf_config/juno-tzmp-mbedtls-rsa-ecdsa-with-ecdsa-rotpk
new file mode 100644
index 0000000..5333f92
--- /dev/null
+++ b/tf_config/juno-tzmp-mbedtls-rsa-ecdsa-with-ecdsa-rotpk
@@ -0,0 +1,12 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+ARM_TSP_RAM_LOCATION=dram
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+GENERATE_COT=1
+JUNO_TZMP1=1
+LOG_LEVEL=20
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-tzmp-mbedtls-rsa-ecdsa-with-rsa-rotpk b/tf_config/juno-tzmp-mbedtls-rsa-ecdsa-with-rsa-rotpk
new file mode 100644
index 0000000..36ef280
--- /dev/null
+++ b/tf_config/juno-tzmp-mbedtls-rsa-ecdsa-with-rsa-rotpk
@@ -0,0 +1,12 @@
+ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=dram
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+GENERATE_COT=1
+JUNO_TZMP1=1
+LOG_LEVEL=20
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-tzmp-mbedtls-rsa-opteed b/tf_config/juno-tzmp-mbedtls-rsa-opteed
new file mode 100644
index 0000000..43bbb46
--- /dev/null
+++ b/tf_config/juno-tzmp-mbedtls-rsa-opteed
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=dram
+CREATE_KEYS=1
+CROSS_COMPILE=aarch64-none-elf-
+CSS_USE_SCMI_SDS_DRIVER=1
+GENERATE_COT=1
+JUNO_TZMP1=1
+PLAT=juno
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/juno-tzmp1 b/tf_config/juno-tzmp1
new file mode 100644
index 0000000..f498c7d
--- /dev/null
+++ b/tf_config/juno-tzmp1
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+JUNO_TZMP1=1
+PLAT=juno
diff --git a/tf_config/k3-default b/tf_config/k3-default
new file mode 100644
index 0000000..750f53e
--- /dev/null
+++ b/tf_config/k3-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=k3
diff --git a/tf_config/ls1043-default b/tf_config/ls1043-default
new file mode 100644
index 0000000..ec965cf
--- /dev/null
+++ b/tf_config/ls1043-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=ls1043
diff --git a/tf_config/ls1043-opteed b/tf_config/ls1043-opteed
new file mode 100644
index 0000000..050cf8c
--- /dev/null
+++ b/tf_config/ls1043-opteed
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+LOG_LEVEL=0
+PLAT=ls1043
+SPD=opteed
diff --git a/tf_config/ls1043-tspd b/tf_config/ls1043-tspd
new file mode 100644
index 0000000..6c710a2
--- /dev/null
+++ b/tf_config/ls1043-tspd
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_BACKTRACE=0
+LOG_LEVEL=0
+PLAT=ls1043
+SPD=tspd
diff --git a/tf_config/mt6795-default b/tf_config/mt6795-default
new file mode 100644
index 0000000..cb50de2
--- /dev/null
+++ b/tf_config/mt6795-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=mt6795
diff --git a/tf_config/mt8173-default b/tf_config/mt8173-default
new file mode 100644
index 0000000..6e12270
--- /dev/null
+++ b/tf_config/mt8173-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=mt8173
diff --git a/tf_config/mt8183-default b/tf_config/mt8183-default
new file mode 100644
index 0000000..349c7ce
--- /dev/null
+++ b/tf_config/mt8183-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=mt8183
diff --git a/tf_config/n1sdp-default b/tf_config/n1sdp-default
new file mode 100644
index 0000000..4125932
--- /dev/null
+++ b/tf_config/n1sdp-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=n1sdp
diff --git a/tf_config/n1sdp-error-deprecated b/tf_config/n1sdp-error-deprecated
new file mode 100644
index 0000000..a071a91
--- /dev/null
+++ b/tf_config/n1sdp-error-deprecated
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERROR_DEPRECATED=1
+PLAT=n1sdp
diff --git a/tf_config/picopi-default b/tf_config/picopi-default
new file mode 100644
index 0000000..b429863
--- /dev/null
+++ b/tf_config/picopi-default
@@ -0,0 +1,4 @@
+AARCH32_SP=optee
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=picopi
diff --git a/tf_config/poplar-default b/tf_config/poplar-default
new file mode 100644
index 0000000..c274134
--- /dev/null
+++ b/tf_config/poplar-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=poplar
diff --git a/tf_config/px30-default b/tf_config/px30-default
new file mode 100644
index 0000000..2772968
--- /dev/null
+++ b/tf_config/px30-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=px30
diff --git a/tf_config/qemu-aarch32-opteed b/tf_config/qemu-aarch32-opteed
new file mode 100644
index 0000000..2e8dd46
--- /dev/null
+++ b/tf_config/qemu-aarch32-opteed
@@ -0,0 +1,5 @@
+AARCH32_SP=optee
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+CROSS_COMPILE=arm-none-eabi-
+PLAT=qemu
diff --git a/tf_config/qemu-default b/tf_config/qemu-default
new file mode 100644
index 0000000..200f552
--- /dev/null
+++ b/tf_config/qemu-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=qemu
diff --git a/tf_config/qemu-gicv3 b/tf_config/qemu-gicv3
new file mode 100644
index 0000000..45165a4
--- /dev/null
+++ b/tf_config/qemu-gicv3
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=qemu
+QEMU_USE_GIC_DRIVER=QEMU_GICV3
diff --git a/tf_config/qemu-opteed-tbb-enc b/tf_config/qemu-opteed-tbb-enc
new file mode 100644
index 0000000..a57c61e
--- /dev/null
+++ b/tf_config/qemu-opteed-tbb-enc
@@ -0,0 +1,10 @@
+BL32_RAM_LOCATION=tdram
+CROSS_COMPILE=aarch64-none-elf-
+DECRYPTION_SUPPORT=aes_gcm
+ENCRYPT_BL31=1
+ENCRYPT_BL32=1
+FW_ENC_STATUS=0
+GENERATE_COT=1
+PLAT=qemu
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/qemu-tbb b/tf_config/qemu-tbb
new file mode 100644
index 0000000..478f93d
--- /dev/null
+++ b/tf_config/qemu-tbb
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=qemu
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/qemu_sbsa-default b/tf_config/qemu_sbsa-default
new file mode 100644
index 0000000..1bf5a62
--- /dev/null
+++ b/tf_config/qemu_sbsa-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=qemu_sbsa
diff --git a/tf_config/qemu_sbsa-stack-protector b/tf_config/qemu_sbsa-stack-protector
new file mode 100644
index 0000000..042d74e
--- /dev/null
+++ b/tf_config/qemu_sbsa-stack-protector
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_STACK_PROTECTOR=strong
+PLAT=qemu_sbsa
diff --git a/tf_config/rcar-auto-opteed b/tf_config/rcar-auto-opteed
new file mode 100644
index 0000000..8cd6814
--- /dev/null
+++ b/tf_config/rcar-auto-opteed
@@ -0,0 +1,7 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=AUTO
+PLAT=rcar
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-d3-draak b/tf_config/rcar-d3-draak
new file mode 100644
index 0000000..a6dd8cd
--- /dev/null
+++ b/tf_config/rcar-d3-draak
@@ -0,0 +1,13 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LIFEC_DBSC_PROTECT_ENABLE=0
+LSI=D3
+PLAT=rcar
+PMIC_ROHM_BD9571=0
+RCAR_AVS_SETTING_ENABLE=0
+RCAR_LOSSY_ENABLE=0
+RCAR_SA0_SIZE=0
+RCAR_SYSTEM_SUSPEND=0
+SPD=none
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-e3-ebisu-4d-opteed b/tf_config/rcar-e3-ebisu-4d-opteed
new file mode 100644
index 0000000..75b05a7
--- /dev/null
+++ b/tf_config/rcar-e3-ebisu-4d-opteed
@@ -0,0 +1,10 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=E3
+PLAT=rcar
+RCAR_AVS_SETTING_ENABLE=0
+RCAR_DRAM_DDR3L_MEMCONF=1
+RCAR_SA0_SIZE=0
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-e3-ebisu-opteed b/tf_config/rcar-e3-ebisu-opteed
new file mode 100644
index 0000000..6b24cfc
--- /dev/null
+++ b/tf_config/rcar-e3-ebisu-opteed
@@ -0,0 +1,10 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=E3
+PLAT=rcar
+RCAR_AVS_SETTING_ENABLE=0
+RCAR_DRAM_DDR3L_MEMCONF=0
+RCAR_SA0_SIZE=0
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-h3-salvator-x-opteed b/tf_config/rcar-h3-salvator-x-opteed
new file mode 100644
index 0000000..7e6eb78
--- /dev/null
+++ b/tf_config/rcar-h3-salvator-x-opteed
@@ -0,0 +1,10 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=H3
+MACHINE=salvator-x
+PLAT=rcar
+RCAR_DRAM_LPDDR4_MEMCONF=0
+RCAR_DRAM_SPLIT=1
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-h3-ulcb-opteed b/tf_config/rcar-h3-ulcb-opteed
new file mode 100644
index 0000000..d569ec2
--- /dev/null
+++ b/tf_config/rcar-h3-ulcb-opteed
@@ -0,0 +1,12 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=H3
+MACHINE=ulcb
+PLAT=rcar
+PMIC_LEVEL_MODE=0
+RCAR_DRAM_LPDDR4_MEMCONF=0
+RCAR_DRAM_SPLIT=1
+RCAR_GEN3_ULCB=1
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-h3n-opteed b/tf_config/rcar-h3n-opteed
new file mode 100644
index 0000000..96a869e
--- /dev/null
+++ b/tf_config/rcar-h3n-opteed
@@ -0,0 +1,7 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=H3N
+PLAT=rcar
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-m3-salvator-x-opteed b/tf_config/rcar-m3-salvator-x-opteed
new file mode 100644
index 0000000..83b9348
--- /dev/null
+++ b/tf_config/rcar-m3-salvator-x-opteed
@@ -0,0 +1,10 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=M3
+MACHINE=salvator-x
+PLAT=rcar
+RCAR_DRAM_LPDDR4_MEMCONF=0
+RCAR_DRAM_SPLIT=2
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-m3-ulcb-opteed b/tf_config/rcar-m3-ulcb-opteed
new file mode 100644
index 0000000..e5001fd
--- /dev/null
+++ b/tf_config/rcar-m3-ulcb-opteed
@@ -0,0 +1,12 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=M3
+MACHINE=ulcb
+PLAT=rcar
+PMIC_LEVEL_MODE=0
+RCAR_DRAM_LPDDR4_MEMCONF=0
+RCAR_DRAM_SPLIT=2
+RCAR_GEN3_ULCB=1
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-m3n-salvator-x-opteed b/tf_config/rcar-m3n-salvator-x-opteed
new file mode 100644
index 0000000..ff24580
--- /dev/null
+++ b/tf_config/rcar-m3n-salvator-x-opteed
@@ -0,0 +1,9 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=M3N
+MACHINE=salvator-x
+PLAT=rcar
+RCAR_DRAM_LPDDR4_MEMCONF=0
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-m3n-ulcb-opteed b/tf_config/rcar-m3n-ulcb-opteed
new file mode 100644
index 0000000..b8572ba
--- /dev/null
+++ b/tf_config/rcar-m3n-ulcb-opteed
@@ -0,0 +1,11 @@
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=M3N
+MACHINE=ulcb
+PLAT=rcar
+PMIC_LEVEL_MODE=0
+RCAR_DRAM_LPDDR4_MEMCONF=0
+RCAR_GEN3_ULCB=1
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rcar-v3m-eagle b/tf_config/rcar-v3m-eagle
new file mode 100644
index 0000000..3c2c849
--- /dev/null
+++ b/tf_config/rcar-v3m-eagle
@@ -0,0 +1,12 @@
+AVS_SETTING_ENABLE=0
+BL32=Makefile
+BL33=Makefile
+CROSS_COMPILE=aarch64-none-elf-
+LSI=V3M
+MACHINE=eagle
+PLAT=rcar
+PMIC_ROHM_BD9571=0
+RCAR_DRAM_SPLIT=0
+RCAR_SYSTEM_SUSPEND=0
+SPD=none
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/rk3288-default b/tf_config/rk3288-default
new file mode 100644
index 0000000..a33fe80
--- /dev/null
+++ b/tf_config/rk3288-default
@@ -0,0 +1,4 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=rk3288
diff --git a/tf_config/rk3328-coreboot b/tf_config/rk3328-coreboot
new file mode 100644
index 0000000..a4ab4e7
--- /dev/null
+++ b/tf_config/rk3328-coreboot
@@ -0,0 +1,3 @@
+COREBOOT=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rk3328
diff --git a/tf_config/rk3328-default b/tf_config/rk3328-default
new file mode 100644
index 0000000..722a0d7
--- /dev/null
+++ b/tf_config/rk3328-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rk3328
diff --git a/tf_config/rk3368-coreboot b/tf_config/rk3368-coreboot
new file mode 100644
index 0000000..dba3bf0
--- /dev/null
+++ b/tf_config/rk3368-coreboot
@@ -0,0 +1,3 @@
+COREBOOT=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rk3368
diff --git a/tf_config/rk3368-default b/tf_config/rk3368-default
new file mode 100644
index 0000000..19eeeea
--- /dev/null
+++ b/tf_config/rk3368-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rk3368
diff --git a/tf_config/rk3399-coreboot b/tf_config/rk3399-coreboot
new file mode 100644
index 0000000..bc9294a
--- /dev/null
+++ b/tf_config/rk3399-coreboot
@@ -0,0 +1,3 @@
+COREBOOT=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rk3399
diff --git a/tf_config/rk3399-default b/tf_config/rk3399-default
new file mode 100644
index 0000000..9a27e0c
--- /dev/null
+++ b/tf_config/rk3399-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rk3399
diff --git a/tf_config/rpi3-default b/tf_config/rpi3-default
new file mode 100644
index 0000000..9b10a8c
--- /dev/null
+++ b/tf_config/rpi3-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rpi3
+PRELOADED_BL33_BASE=0xDEADBEEF
diff --git a/tf_config/rpi3-stack-protector b/tf_config/rpi3-stack-protector
new file mode 100644
index 0000000..d5d417c
--- /dev/null
+++ b/tf_config/rpi3-stack-protector
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rpi3
+PRELOADED_BL33_BASE=0xDEADBEEF
+ENABLE_STACK_PROTECTOR=strong
diff --git a/tf_config/rpi4-default b/tf_config/rpi4-default
new file mode 100644
index 0000000..d878041
--- /dev/null
+++ b/tf_config/rpi4-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rpi4
diff --git a/tf_config/stingray-default b/tf_config/stingray-default
new file mode 100644
index 0000000..31bb3a2
--- /dev/null
+++ b/tf_config/stingray-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+BOARD_CFG=bcm958742t
+PLAT=stingray
diff --git a/tf_config/stm32mp1-default b/tf_config/stm32mp1-default
new file mode 100644
index 0000000..a36c0a9
--- /dev/null
+++ b/tf_config/stm32mp1-default
@@ -0,0 +1,10 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+CROSS_COMPILE=arm-none-eabi-
+PLAT=stm32mp1
+STM32MP_EMMC=1
+STM32MP_RAW_NAND=1
+STM32MP_SDMMC=1
+STM32MP_SPI_NAND=1
+STM32MP_SPI_NOR=1
diff --git a/tf_config/stratix10-default b/tf_config/stratix10-default
new file mode 100644
index 0000000..3a50a9c
--- /dev/null
+++ b/tf_config/stratix10-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=stratix10
diff --git a/tf_config/sun50i_a64-default b/tf_config/sun50i_a64-default
new file mode 100644
index 0000000..7e1e0ba
--- /dev/null
+++ b/tf_config/sun50i_a64-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=sun50i_a64
diff --git a/tf_config/sun50i_h6-default b/tf_config/sun50i_h6-default
new file mode 100644
index 0000000..8e4de11
--- /dev/null
+++ b/tf_config/sun50i_h6-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=sun50i_h6
diff --git a/tf_config/synquacer-default b/tf_config/synquacer-default
new file mode 100644
index 0000000..5c5d983
--- /dev/null
+++ b/tf_config/synquacer-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=synquacer
+PRELOADED_BL33_BASE=0x0
diff --git a/tf_config/synquacer-spm b/tf_config/synquacer-spm
new file mode 100644
index 0000000..a32a8bb
--- /dev/null
+++ b/tf_config/synquacer-spm
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+SPM_MM=1
+PLAT=synquacer
+PRELOADED_BL33_BASE=0x0
diff --git a/tf_config/tegra-t132-tlkd b/tf_config/tegra-t132-tlkd
new file mode 100644
index 0000000..f3fd0ea
--- /dev/null
+++ b/tf_config/tegra-t132-tlkd
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=tegra
+SPD=tlkd
+TARGET_SOC=t132
diff --git a/tf_config/tegra-t132-trusty b/tf_config/tegra-t132-trusty
new file mode 100644
index 0000000..ef646d1
--- /dev/null
+++ b/tf_config/tegra-t132-trusty
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=tegra
+SPD=trusty
+TARGET_SOC=t132
diff --git a/tf_config/tegra-t186-trusty b/tf_config/tegra-t186-trusty
new file mode 100644
index 0000000..db9d180
--- /dev/null
+++ b/tf_config/tegra-t186-trusty
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=tegra
+SPD=trusty
+TARGET_SOC=t186
diff --git a/tf_config/tegra-t194-default b/tf_config/tegra-t194-default
new file mode 100644
index 0000000..07a13dd
--- /dev/null
+++ b/tf_config/tegra-t194-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=tegra
+TARGET_SOC=t194
diff --git a/tf_config/tegra-t210-tlkd b/tf_config/tegra-t210-tlkd
new file mode 100644
index 0000000..b3d264b
--- /dev/null
+++ b/tf_config/tegra-t210-tlkd
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=tegra
+SPD=tlkd
+TARGET_SOC=t210
diff --git a/tf_config/tegra-t210-trusty b/tf_config/tegra-t210-trusty
new file mode 100644
index 0000000..678ccd7
--- /dev/null
+++ b/tf_config/tegra-t210-trusty
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=tegra
+SPD=trusty
+TARGET_SOC=t210
diff --git a/tf_config/uniphier-default b/tf_config/uniphier-default
new file mode 100644
index 0000000..0ddf612
--- /dev/null
+++ b/tf_config/uniphier-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=uniphier
diff --git a/tf_config/uniphier-tbb b/tf_config/uniphier-tbb
new file mode 100644
index 0000000..e97fa08
--- /dev/null
+++ b/tf_config/uniphier-tbb
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=uniphier
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/uniphier-tbb-gzip b/tf_config/uniphier-tbb-gzip
new file mode 100644
index 0000000..e0d951d
--- /dev/null
+++ b/tf_config/uniphier-tbb-gzip
@@ -0,0 +1,6 @@
+CROSS_COMPILE=aarch64-none-elf-
+FIP_GZIP=1
+GENERATE_COT=1
+LOG_LEVE=50
+PLAT=uniphier
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/uniphier-tsp b/tf_config/uniphier-tsp
new file mode 100644
index 0000000..fe5b084
--- /dev/null
+++ b/tf_config/uniphier-tsp
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=uniphier
+SPD=tspd
diff --git a/tf_config/versal-default b/tf_config/versal-default
new file mode 100644
index 0000000..fb6ab9d
--- /dev/null
+++ b/tf_config/versal-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=versal
+RESET_TO_BL31=1
diff --git a/tf_config/versal-virt b/tf_config/versal-virt
new file mode 100644
index 0000000..be88fdc
--- /dev/null
+++ b/tf_config/versal-virt
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=versal
+RESET_TO_BL31=1
+VERSAL_PLATFORM=versal_virt
diff --git a/tf_config/warp7-default b/tf_config/warp7-default
new file mode 100644
index 0000000..628e77d
--- /dev/null
+++ b/tf_config/warp7-default
@@ -0,0 +1,6 @@
+AARCH32_SP=optee
+ARCH=aarch32
+ARM_ARCH_MAJOR=7
+ARM_CORTEX_A7=yes
+CROSS_COMPILE=arm-none-eabi-
+PLAT=warp7
diff --git a/tf_config/zynqmp-default b/tf_config/zynqmp-default
new file mode 100644
index 0000000..4a87021
--- /dev/null
+++ b/tf_config/zynqmp-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=zynqmp
+RESET_TO_BL31=1
diff --git a/tf_config/zynqmp-tspd b/tf_config/zynqmp-tspd
new file mode 100644
index 0000000..b0f1799
--- /dev/null
+++ b/tf_config/zynqmp-tspd
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=zynqmp
+RESET_TO_BL31=1
+SPD=tspd
diff --git a/tf_config/zynqmp-tspd-tdram b/tf_config/zynqmp-tspd-tdram
new file mode 100644
index 0000000..0b8cd89
--- /dev/null
+++ b/tf_config/zynqmp-tspd-tdram
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=zynqmp
+RESET_TO_BL31=1
+SPD=tspd
+ZYNQMP_TSP_RAM_LOCATION=tdram