diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug b/group/tf-l2-boot-tests-foundation/fvp-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
similarity index 100%
rename from group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
rename to group/tf-l2-boot-tests-foundation/fvp-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
diff --git a/group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8 b/group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
similarity index 100%
rename from group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
rename to group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
diff --git a/group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug b/group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
similarity index 100%
rename from group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
rename to group/tf-l2-boot-tests-foundation/fvp-opteed-aarch64-only:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
diff --git a/group/tf-l2-boot-tests-foundation/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug b/group/tf-l2-boot-tests-foundation/fvp-tspd-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
similarity index 100%
rename from group/tf-l2-boot-tests-foundation/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
rename to group/tf-l2-boot-tests-foundation/fvp-tspd-aarch64-only:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext b/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext
rename to group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva.etm_trace_ext b/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.etm_trace_ext
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva.etm_trace_ext
rename to group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.etm_trace_ext
diff --git a/group/tf-l2-boot-tests-misc/fvp-detect-features,fvp-default:fvp-tftf-fip.tftf-aemv8a.arch_features b/group/tf-l2-boot-tests-misc/fvp-detect-features-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemv8a.arch_features
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-detect-features,fvp-default:fvp-tftf-fip.tftf-aemv8a.arch_features
rename to group/tf-l2-boot-tests-misc/fvp-detect-features-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemv8a.arch_features
diff --git a/group/tf-l2-boot-tests-misc/fvp-no-sys-regs-trace-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-no-sys-regs-trace-access-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-no-sys-regs-trace-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
copy to group/tf-l2-boot-tests-misc/fvp-no-sys-regs-trace-access-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-no-trbe-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-no-trbe-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
deleted file mode 100644
index 1bbc737..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-no-trbe-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-misc/fvp-no-sys-regs-trace-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-no-trbe-regs-access-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-no-sys-regs-trace-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
rename to group/tf-l2-boot-tests-misc/fvp-no-trbe-regs-access-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-no-trf-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-no-trf-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
deleted file mode 100644
index 1bbc737..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-no-trf-regs-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-misc/fvp-no-sys-regs-trace-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-no-trf-regs-access-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-no-sys-regs-trace-access,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
copy to group/tf-l2-boot-tests-misc/fvp-no-trf-regs-access-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic-debug
diff --git a/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug b/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm-aarch64-only,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
similarity index 100%
rename from group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
rename to group/tf-l3-boot-tests-spm-mm/fvp-spm-mm-aarch64-only,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
diff --git a/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l1-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8
similarity index 100%
rename from group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8
rename to group/tftf-l1-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8
diff --git a/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd b/group/tftf-l1-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd
similarity index 100%
rename from group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd
rename to group/tftf-l1-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l2-extensive-tests-fvp/fvp-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8
similarity index 100%
rename from group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-foundationv8
rename to group/tftf-l2-extensive-tests-fvp/fvp-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd b/group/tftf-l2-extensive-tests-fvp/fvp-tspd-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd
similarity index 100%
rename from group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd
rename to group/tftf-l2-extensive-tests-fvp/fvp-tspd-aarch64-only,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8
similarity index 100%
rename from group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-foundationv8
rename to group/tftf-l2-fvp-auxiliary/fvp-no-cohmem-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8 b/group/tftf-l2-fvp-auxiliary/fvp-opteed-aarch64-only,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8
similarity index 100%
rename from group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8
rename to group/tftf-l2-fvp-auxiliary/fvp-opteed-aarch64-only,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
rename to group/tftf-l2-fvp/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
copy to group/tftf-l2-fvp/fvp-enable-runtime-instr-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
copy to group/tftf-l2-fvp/fvp-ext-pstate-ea-el3-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
diff --git a/group/tftf-l2-fvp/fvp-default-hcx,fvp-hcx:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l2-fvp/fvp-hcx-aarch64-only,fvp-hcx:fvp-tftf-fip.tftf-foundationv8
similarity index 100%
rename from group/tftf-l2-fvp/fvp-default-hcx,fvp-hcx:fvp-tftf-fip.tftf-foundationv8
rename to group/tftf-l2-fvp/fvp-hcx-aarch64-only,fvp-hcx:fvp-tftf-fip.tftf-foundationv8
diff --git a/group/tftf-l2-fvp/fvp-mtpmu-disable,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug b/group/tftf-l2-fvp/fvp-mtpmu-disable-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-mtpmu-disable,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
rename to group/tftf-l2-fvp/fvp-mtpmu-disable-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
diff --git a/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug b/group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
rename to group/tftf-l2-fvp/fvp-tspd-aarch64-only,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
diff --git a/tf_config/fvp-no-trbe-regs-access b/tf_config/fvp-aarch64-only
similarity index 60%
copy from tf_config/fvp-no-trbe-regs-access
copy to tf_config/fvp-aarch64-only
index d1ea80d..bfb33e1 100644
--- a/tf_config/fvp-no-trbe-regs-access
+++ b/tf_config/fvp-aarch64-only
@@ -1,3 +1,3 @@
 CROSS_COMPILE=aarch64-none-elf-
-ENABLE_TRBE_FOR_NS=0
+CTX_INCLUDE_AARCH32_REGS=0
 PLAT=fvp
diff --git a/tf_config/fvp-detect-features-aarch64-only b/tf_config/fvp-detect-features-aarch64-only
new file mode 100644
index 0000000..126a2b1
--- /dev/null
+++ b/tf_config/fvp-detect-features-aarch64-only
@@ -0,0 +1,5 @@
+ARM_ARCH_MINOR=6
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+FEATURE_DETECTION=1
+PLAT=fvp
diff --git a/tf_config/fvp-enable-runtime-instr-aarch64-only b/tf_config/fvp-enable-runtime-instr-aarch64-only
new file mode 100644
index 0000000..bddb3a0
--- /dev/null
+++ b/tf_config/fvp-enable-runtime-instr-aarch64-only
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+ENABLE_RUNTIME_INSTRUMENTATION=1
+PLAT=fvp
diff --git a/tf_config/fvp-ext-pstate-ea-el3-aarch64-only b/tf_config/fvp-ext-pstate-ea-el3-aarch64-only
new file mode 100644
index 0000000..34a1a58
--- /dev/null
+++ b/tf_config/fvp-ext-pstate-ea-el3-aarch64-only
@@ -0,0 +1,6 @@
+ARM_RECOM_STATE_ID_ENC=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+HANDLE_EA_EL3_FIRST=1
+PLAT=fvp
+PSCI_EXTENDED_STATE_ID=1
diff --git a/tf_config/fvp-hcx-aarch64-only b/tf_config/fvp-hcx-aarch64-only
new file mode 100644
index 0000000..bb7c079
--- /dev/null
+++ b/tf_config/fvp-hcx-aarch64-only
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+ENABLE_FEAT_HCX=1
+PLAT=fvp
diff --git a/tf_config/fvp-mtpmu-disable-aarch64-only b/tf_config/fvp-mtpmu-disable-aarch64-only
new file mode 100644
index 0000000..9591b11
--- /dev/null
+++ b/tf_config/fvp-mtpmu-disable-aarch64-only
@@ -0,0 +1,5 @@
+ARM_ARCH_MINOR=6
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+DISABLE_MTPMU=1
+PLAT=fvp
diff --git a/tf_config/fvp-no-cohmem-aarch64-only b/tf_config/fvp-no-cohmem-aarch64-only
new file mode 100644
index 0000000..167c5eb
--- /dev/null
+++ b/tf_config/fvp-no-cohmem-aarch64-only
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-no-sys-regs-trace-access b/tf_config/fvp-no-sys-regs-trace-access-aarch64-only
similarity index 72%
rename from tf_config/fvp-no-sys-regs-trace-access
rename to tf_config/fvp-no-sys-regs-trace-access-aarch64-only
index 4a5adb3..2ce942c 100644
--- a/tf_config/fvp-no-sys-regs-trace-access
+++ b/tf_config/fvp-no-sys-regs-trace-access-aarch64-only
@@ -1,3 +1,4 @@
 CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
 ENABLE_SYS_REG_TRACE_FOR_NS=0
 PLAT=fvp
diff --git a/tf_config/fvp-no-trbe-regs-access b/tf_config/fvp-no-trbe-regs-access-aarch64-only
similarity index 69%
rename from tf_config/fvp-no-trbe-regs-access
rename to tf_config/fvp-no-trbe-regs-access-aarch64-only
index d1ea80d..c897486 100644
--- a/tf_config/fvp-no-trbe-regs-access
+++ b/tf_config/fvp-no-trbe-regs-access-aarch64-only
@@ -1,3 +1,4 @@
 CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
 ENABLE_TRBE_FOR_NS=0
 PLAT=fvp
diff --git a/tf_config/fvp-no-trf-regs-access b/tf_config/fvp-no-trf-regs-access-aarch64-only
similarity index 69%
rename from tf_config/fvp-no-trf-regs-access
rename to tf_config/fvp-no-trf-regs-access-aarch64-only
index c18ad40..3493535 100644
--- a/tf_config/fvp-no-trf-regs-access
+++ b/tf_config/fvp-no-trf-regs-access-aarch64-only
@@ -1,3 +1,4 @@
 CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
 ENABLE_TRF_FOR_NS=0
 PLAT=fvp
diff --git a/tf_config/fvp-opteed-aarch64-only b/tf_config/fvp-opteed-aarch64-only
new file mode 100644
index 0000000..5f750f7
--- /dev/null
+++ b/tf_config/fvp-opteed-aarch64-only
@@ -0,0 +1,5 @@
+ARM_TSP_RAM_LOCATION=tdram
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+PLAT=fvp
+SPD=opteed
diff --git a/tf_config/fvp-spm-mm-aarch64-only b/tf_config/fvp-spm-mm-aarch64-only
new file mode 100644
index 0000000..672a35d
--- /dev/null
+++ b/tf_config/fvp-spm-mm-aarch64-only
@@ -0,0 +1,9 @@
+ARM_BL31_IN_DRAM=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+CTX_INCLUDE_FPREGS=1
+EL3_EXCEPTION_HANDLING=1
+ENABLE_SVE_FOR_NS=0
+PLAT=fvp
+SPM_MM=1
+