diff --git a/tf_config/fvp-aarch32-rst-to-sp-min-pl33 b/tf_config/fvp-aarch32-rst-to-sp-min-pl33
new file mode 100644
index 0000000..25e06be
--- /dev/null
+++ b/tf_config/fvp-aarch32-rst-to-sp-min-pl33
@@ -0,0 +1,6 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=fvp
+PRELOADED_BL33_BASE=0x80000000
+RESET_TO_SP_MIN=1
diff --git a/tf_config/fvp-debugfs-debug b/tf_config/fvp-debugfs-debug
new file mode 100644
index 0000000..e6d51fb
--- /dev/null
+++ b/tf_config/fvp-debugfs-debug
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+DEBUG=1
+PLAT=fvp
+USE_DEBUGFS=1
diff --git a/tf_config/fvp-el3-spmc b/tf_config/fvp-el3-spmc
new file mode 100644
index 0000000..9fbbcda
--- /dev/null
+++ b/tf_config/fvp-el3-spmc
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=spmd
+SPMC_AT_EL3=1
+SPMD_SPM_AT_SEL2=0
diff --git a/tf_config/fvp-enable-pmf b/tf_config/fvp-enable-pmf
new file mode 100644
index 0000000..39b6c03
--- /dev/null
+++ b/tf_config/fvp-enable-pmf
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_PMF=1
+PLAT=fvp
diff --git a/tf_config/fvp-errata-abi b/tf_config/fvp-errata-abi
new file mode 100644
index 0000000..8a6cd8f
--- /dev/null
+++ b/tf_config/fvp-errata-abi
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERRATA_ABI_SUPPORT=1
+PLAT=fvp
diff --git a/tf_config/fvp-ext-pstate-tspd-tsp-dram b/tf_config/fvp-ext-pstate-tspd-tsp-dram
new file mode 100644
index 0000000..e07ceb4
--- /dev/null
+++ b/tf_config/fvp-ext-pstate-tspd-tsp-dram
@@ -0,0 +1,6 @@
+ARM_RECOM_STATE_ID_ENC=1
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+PSCI_EXTENDED_STATE_ID=1
+SPD=tspd
diff --git a/tf_config/fvp-gicv3-extended b/tf_config/fvp-gicv3-extended
new file mode 100644
index 0000000..52bd018
--- /dev/null
+++ b/tf_config/fvp-gicv3-extended
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+GIC_EXT_INTID=1
+PLAT=fvp
diff --git a/tf_config/fvp-gpt-romlib-fwu b/tf_config/fvp-gpt-romlib-fwu
new file mode 100644
index 0000000..d784c5a
--- /dev/null
+++ b/tf_config/fvp-gpt-romlib-fwu
@@ -0,0 +1,8 @@
+ARM_GPT_SUPPORT=1
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+PLAT=fvp
+PSA_FWU_SUPPORT=1
+USE_ROMLIB=1
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-mb_hash256-romlib b/tf_config/fvp-mb_hash256-romlib
new file mode 100644
index 0000000..918c450
--- /dev/null
+++ b/tf_config/fvp-mb_hash256-romlib
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+MBOOT_EL_HASH_ALG=sha256
+MEASURED_BOOT=1
+PLAT=fvp
+USE_ROMLIB=1
diff --git a/tf_config/fvp-mpam b/tf_config/fvp-mpam
new file mode 100644
index 0000000..87b7553
--- /dev/null
+++ b/tf_config/fvp-mpam
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_MPAM_FOR_LOWER_ELS=1
+PLAT=fvp
diff --git a/tf_config/fvp-opteed-smc-load b/tf_config/fvp-opteed-smc-load
new file mode 100644
index 0000000..4efd78d
--- /dev/null
+++ b/tf_config/fvp-opteed-smc-load
@@ -0,0 +1,6 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+OPTEE_ALLOW_SMC_LOAD=1
+PLAT=fvp
+PLAT_XLAT_TABLES_DYNAMIC=1
+SPD=opteed
diff --git a/tf_config/fvp-opteed-sram b/tf_config/fvp-opteed-sram
new file mode 100644
index 0000000..d108db2
--- /dev/null
+++ b/tf_config/fvp-opteed-sram
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+PLAT=fvp
+SPD=opteed
diff --git a/tf_config/fvp-pci b/tf_config/fvp-pci
new file mode 100644
index 0000000..9bc4f9c
--- /dev/null
+++ b/tf_config/fvp-pci
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SMC_PCI_SUPPORT=1
diff --git a/tf_config/fvp-pncd b/tf_config/fvp-pncd
new file mode 100644
index 0000000..d29b4cb
--- /dev/null
+++ b/tf_config/fvp-pncd
@@ -0,0 +1,5 @@
+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-quad-cluster b/tf_config/fvp-quad-cluster
new file mode 100644
index 0000000..04ca3bb
--- /dev/null
+++ b/tf_config/fvp-quad-cluster
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_CLUSTER_COUNT=4
+PLAT=fvp
diff --git a/tf_config/fvp-romlib-cot-in-dtb b/tf_config/fvp-romlib-cot-in-dtb
new file mode 100644
index 0000000..551a562
--- /dev/null
+++ b/tf_config/fvp-romlib-cot-in-dtb
@@ -0,0 +1,6 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+COT_DESC_IN_DTB=1
+PLAT=fvp
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-sme b/tf_config/fvp-sme
new file mode 100644
index 0000000..1d4ddcb
--- /dev/null
+++ b/tf_config/fvp-sme
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_FEAT_HCX=1
+ENABLE_SME_FOR_NS=1
+PLAT=fvp
diff --git a/tf_config/fvp-sme2 b/tf_config/fvp-sme2
new file mode 100644
index 0000000..16ddb31
--- /dev/null
+++ b/tf_config/fvp-sme2
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_FEAT_HCX=1
+ENABLE_SME_FOR_NS=1
+ENABLE_SME2_FOR_NS=1
+PLAT=fvp
diff --git a/tf_config/fvp-sp804-timer b/tf_config/fvp-sp804-timer
new file mode 100644
index 0000000..59f84be
--- /dev/null
+++ b/tf_config/fvp-sp804-timer
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_USE_SP804_TIMER=1
+PLAT=fvp
diff --git a/tf_config/fvp-spm-el2 b/tf_config/fvp-spm-el2
new file mode 100644
index 0000000..d9ff4f4
--- /dev/null
+++ b/tf_config/fvp-spm-el2
@@ -0,0 +1,6 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_EL2_REGS=1
+PLAT=fvp
+SPD=spmd
+SPMD_SPM_AT_SEL2=1
+SP_LAYOUT_FILE=dummy
diff --git a/tf_config/fvp-spm-mm-default b/tf_config/fvp-spm-mm-default
new file mode 100644
index 0000000..88b42df
--- /dev/null
+++ b/tf_config/fvp-spm-mm-default
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+ENABLE_SVE_FOR_NS=0
+PLAT=fvp
+SPM_MM=1
diff --git a/tf_config/fvp-stack-protector b/tf_config/fvp-stack-protector
new file mode 100644
index 0000000..dc41fff
--- /dev/null
+++ b/tf_config/fvp-stack-protector
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_STACK_PROTECTOR=strong
+PLAT=fvp
diff --git a/tf_config/fvp-tlkd b/tf_config/fvp-tlkd
new file mode 100644
index 0000000..56c416e
--- /dev/null
+++ b/tf_config/fvp-tlkd
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..314de33
--- /dev/null
+++ b/tf_config/fvp-tpm_hash256-drtm-romlib
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..f83896d
--- /dev/null
+++ b/tf_config/fvp-tspd-dualroot
@@ -0,0 +1,4 @@
+COT=dualroot
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
diff --git a/tf_config/fvp-tspd-tsp-dram-async b/tf_config/fvp-tspd-tsp-dram-async
new file mode 100644
index 0000000..28f26de
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-dram-async
@@ -0,0 +1,6 @@
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
+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
new file mode 100644
index 0000000..ae3e1b0
--- /dev/null
+++ b/tf_config/fvp-tspd-tsp-dram-no-cohmem
@@ -0,0 +1,5 @@
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
+USE_COHERENT_MEM=0