diff --git a/group/ci-l1/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/ci-l1/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/ci-l1/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/juno-manual-release-tests/juno-aarch32-el3-runtime,juno-aarch32-extensive:juno-manual.tftf+aarch32-rt32 b/group/juno-manual-release-tests/juno-aarch32-el3-runtime,juno-aarch32-extensive:juno-manual.tftf+aarch32-rt32
new file mode 100644
index 0000000..f5b24ee
--- /dev/null
+++ b/group/juno-manual-release-tests/juno-aarch32-el3-runtime,juno-aarch32-extensive:juno-manual.tftf+aarch32-rt32
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/juno-manual-release-tests/juno-aarch32-el3-runtime,juno-aarch32-manual-shutdown:juno-manual.tftf+aarch32-rt32 b/group/juno-manual-release-tests/juno-aarch32-el3-runtime,juno-aarch32-manual-shutdown:juno-manual.tftf+aarch32-rt32
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/juno-manual-release-tests/juno-aarch32-el3-runtime,juno-aarch32-manual-shutdown:juno-manual.tftf+aarch32-rt32
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/juno-manual-release-tests/juno-aarch32-el3-runtime:juno-manual.linuxshutdown+aarch32-rt32 b/group/juno-manual-release-tests/juno-aarch32-el3-runtime:juno-manual.linuxshutdown+aarch32-rt32
new file mode 100644
index 0000000..f5b24ee
--- /dev/null
+++ b/group/juno-manual-release-tests/juno-aarch32-el3-runtime:juno-manual.linuxshutdown+aarch32-rt32
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/juno-manual-release-tests/juno-default,juno-manual-shutdown:juno-manual.tftf b/group/juno-manual-release-tests/juno-default,juno-manual-shutdown:juno-manual.tftf
new file mode 100644
index 0000000..f5b24ee
--- /dev/null
+++ b/group/juno-manual-release-tests/juno-default,juno-manual-shutdown:juno-manual.tftf
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/juno-manual-release-tests/juno-default:juno-manual.linuxshutdown b/group/juno-manual-release-tests/juno-default:juno-manual.linuxshutdown
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/juno-manual-release-tests/juno-default:juno-manual.linuxshutdown
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/juno-manual-release-tests/juno-manual-extensive,juno-extensive:juno-manual.tftf b/group/juno-manual-release-tests/juno-manual-extensive,juno-extensive:juno-manual.tftf
new file mode 100644
index 0000000..f5b24ee
--- /dev/null
+++ b/group/juno-manual-release-tests/juno-manual-extensive,juno-extensive:juno-manual.tftf
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/juno-manual-release-tests/juno-manual-extensive-sdei,juno-extensive:juno-manual.tftf b/group/juno-manual-release-tests/juno-manual-extensive-sdei,juno-extensive:juno-manual.tftf
new file mode 100644
index 0000000..f5b24ee
--- /dev/null
+++ b/group/juno-manual-release-tests/juno-manual-extensive-sdei,juno-extensive:juno-manual.tftf
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/qa-fvp-pre-release/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug b/group/qa-fvp-pre-release/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva-debug b/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva.8_6-debug b/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva.8_6-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva.8_6-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug b/group/qa-fvp-pre-release/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-debug b/group/qa-fvp-pre-release/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug b/group/qa-fvp-pre-release/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-tspd-aarch64-only:fvp-linux-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug b/group/qa-fvp-pre-release/fvp-tspd-aarch64-only:fvp-linux-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-tspd-aarch64-only:fvp-linux-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x1a53x1-tspd-debug b/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x1a53x1-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x1a53x1-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x2a53x4-tspd-debug b/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x2a53x4-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x2a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/qa-fvp-pre-release/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug b/group/qa-fvp-pre-release/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/qa-fvp-pre-release/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov b/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug-bmcov b/group/scp-boot-tests-coverage/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug-bmcov
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug b/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug b/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-debug b/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/scp-boot-tests/juno,juno-default,nil,juno-scp-tools:juno-scmi b/group/scp-boot-tests/juno,juno-default,nil,juno-scp-tools:juno-scmi
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/scp-boot-tests/juno,juno-default,nil,juno-scp-tools:juno-scmi
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot b/group/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l1-boot-tests-aarch32/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-cortexa32x4-debug b/group/tf-l1-boot-tests-aarch32/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-cortexa32x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-aarch32/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-cortexa32x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.rstspmin-debug b/group/tf-l1-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.rstspmin-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l1-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.rstspmin-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug b/group/tf-l1-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-cortex/fvp-no-cohmem:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4 b/group/tf-l1-boot-tests-cortex/fvp-no-cohmem:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-cortex/fvp-no-cohmem:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-cortex/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/tf-l1-boot-tests-cortex/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-cortex/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-cortex/fvp-tspd:fvp-linux-dtb-fip.uboot-cortexa35x4-tspd b/group/tf-l1-boot-tests-cortex/fvp-tspd:fvp-linux-dtb-fip.uboot-cortexa35x4-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-cortex/fvp-tspd:fvp-linux-dtb-fip.uboot-cortexa35x4-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8 b/group/tf-l1-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-foundation/fvp-tspd:fvp-linux-dtb.foundation-fip.uboot-foundationv8 b/group/tf-l1-boot-tests-foundation/fvp-tspd:fvp-linux-dtb.foundation-fip.uboot-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-foundation/fvp-tspd:fvp-linux-dtb.foundation-fip.uboot-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug b/group/tf-l1-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-juno/juno-tspd:juno-linux.uboot b/group/tf-l1-boot-tests-juno/juno-tspd:juno-linux.uboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-juno/juno-tspd:juno-linux.uboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-misc/fvp-boot-el3-payload,fvp-default:fvp-fip.tftf-el3payload-aemv8a.el3payload-debug b/group/tf-l1-boot-tests-misc/fvp-boot-el3-payload,fvp-default:fvp-fip.tftf-el3payload-aemv8a.el3payload-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-misc/fvp-boot-el3-payload,fvp-default:fvp-fip.tftf-el3payload-aemv8a.el3payload-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l1-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-misc/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/tf-l1-boot-tests-misc/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-misc/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-misc/fvp-rst-bl31:fvp-linux.rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug b/group/tf-l1-boot-tests-misc/fvp-rst-bl31:fvp-linux.rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-misc/fvp-rst-bl31:fvp-linux.rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-misc/fvp-tspd-tsp-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-tspd b/group/tf-l1-boot-tests-misc/fvp-tspd-tsp-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-misc/fvp-tspd-tsp-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-clang/fvp-default-armclang:nil b/group/tf-l1-build-clang/fvp-default-armclang:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-clang/fvp-default-armclang:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-clang/fvp-default-clang-bfd:nil b/group/tf-l1-build-clang/fvp-default-clang-bfd:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l1-build-clang/fvp-default-clang-bfd:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-clang/fvp-default-clang:nil b/group/tf-l1-build-clang/fvp-default-clang:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-clang/fvp-default-clang:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-clang/juno-default-armclang:nil b/group/tf-l1-build-clang/juno-default-armclang:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-clang/juno-default-armclang:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-clang/juno-default-clang:nil b/group/tf-l1-build-clang/juno-default-clang:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-clang/juno-default-clang:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-aarch32-default:nil b/group/tf-l1-build-fvp/fvp-aarch32-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-aarch32-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-aarch32-rst-to-sp-min:nil b/group/tf-l1-build-fvp/fvp-aarch32-rst-to-sp-min:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-aarch32-rst-to-sp-min:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-aarch32-stack-protector:nil b/group/tf-l1-build-fvp/fvp-aarch32-stack-protector:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-aarch32-stack-protector:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-aarch32-tbb-mbedtls:nil b/group/tf-l1-build-fvp/fvp-aarch32-tbb-mbedtls:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-aarch32-tbb-mbedtls:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-aarch32-xlat-lib-v1:nil b/group/tf-l1-build-fvp/fvp-aarch32-xlat-lib-v1:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-aarch32-xlat-lib-v1:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-aarch64-sdei:nil b/group/tf-l1-build-fvp/fvp-aarch64-sdei:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-aarch64-sdei:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-aarch64-stack-protector:nil b/group/tf-l1-build-fvp/fvp-aarch64-stack-protector:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-aarch64-stack-protector:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-arm-bl31-in-dram:nil b/group/tf-l1-build-fvp/fvp-arm-bl31-in-dram:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-arm-bl31-in-dram:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-optee-as-spm:nil b/group/tf-l1-build-fvp/fvp-optee-as-spm:nil
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-optee-as-spm:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l1-build-fvp/fvp-opteed:nil b/group/tf-l1-build-fvp/fvp-opteed:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-opteed:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-rde1edge-tbb:nil b/group/tf-l1-build-fvp/fvp-rde1edge-tbb:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-rde1edge-tbb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-rdn1edge-tbb:nil b/group/tf-l1-build-fvp/fvp-rdn1edge-tbb:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-rdn1edge-tbb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-rst-bl31:nil b/group/tf-l1-build-fvp/fvp-rst-bl31:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-rst-bl31:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil b/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil
new file mode 100644
index 0000000..f56d6f6
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil
@@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+#
+# To build SP packages in TF-A we need to build FIP.
+# The resulting FIP has valid SP Packages mentioned in SP_LAYOUT_FILE but
+# dummy BL33 and BL32.
+#
+post_tf_build() {
+	# Create non-empty dummy images to include in the FIP.
+	local dummy_file="$(mktempfile)"
+	echo "hello world" > "$dummy_file"
+
+	build_fip BL33="$dummy_file" BL32="$dummy_file"
+}
diff --git a/group/tf-l1-build-fvp/fvp-spm-mm:nil b/group/tf-l1-build-fvp/fvp-spm-mm:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-spm-mm:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil
new file mode 100644
index 0000000..249b1b5
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil
@@ -0,0 +1,6 @@
+#!/bin/bash
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l1-build-fvp/fvp-tbb-mbedtls:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-tbb-mbedtls:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-tspd-tbb-mbedtls-dualroot:nil b/group/tf-l1-build-fvp/fvp-tspd-tbb-mbedtls-dualroot:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-tspd-tbb-mbedtls-dualroot:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-tspd:nil b/group/tf-l1-build-fvp/fvp-tspd:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-tspd:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-fvp/fvp-xlat-lib-v1:nil b/group/tf-l1-build-fvp/fvp-xlat-lib-v1:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-xlat-lib-v1:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min-stack-protector:nil b/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min-stack-protector:nil
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min-stack-protector:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min:nil b/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min:nil
new file mode 100644
index 0000000..e73229c
--- /dev/null
+++ b/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min:nil
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	# Only build bl32 target for this config
+	targets="bl32" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-juno/juno-sdei:nil b/group/tf-l1-build-juno/juno-sdei:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-juno/juno-sdei:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-juno/juno-stack-protector:nil b/group/tf-l1-build-juno/juno-stack-protector:nil
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l1-build-juno/juno-stack-protector:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l1-build-juno/juno-tspd:nil b/group/tf-l1-build-juno/juno-tspd:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-juno/juno-tspd:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/a3700-default:nil b/group/tf-l1-build-plat/a3700-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/a3700-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/a5ds:nil b/group/tf-l1-build-plat/a5ds:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/a5ds:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/a70x0-default:nil b/group/tf-l1-build-plat/a70x0-default:nil
new file mode 100644
index 0000000..651719e
--- /dev/null
+++ b/group/tf-l1-build-plat/a70x0-default:nil
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+test_setup() {
+	# Parallel builds are broken for this config; so choose serial.
+	echo "Choosing serial build."
+	set_hook_var "make_j" "1"
+}
+
+pre_tf_build() {
+	pushd "$workspace"
+
+	if [ ! -d "mv-ddr-marvell" ]; then
+		# Archive from mv_ddr-armada-atf-mainline branch
+		saveas="mv-ddr-marvell.tar.gz" \
+			url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-a881467ef0f0185e6570dd0483023fde93cbb5f5.tar.gz" \
+			fetch_file
+
+		tar -xzf "mv-ddr-marvell.tar.gz"
+	fi
+
+	echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
+	set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
+
+	popd "$workspace"
+}
diff --git a/group/tf-l1-build-plat/a70x0_amc-default:nil b/group/tf-l1-build-plat/a70x0_amc-default:nil
new file mode 100644
index 0000000..651719e
--- /dev/null
+++ b/group/tf-l1-build-plat/a70x0_amc-default:nil
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+test_setup() {
+	# Parallel builds are broken for this config; so choose serial.
+	echo "Choosing serial build."
+	set_hook_var "make_j" "1"
+}
+
+pre_tf_build() {
+	pushd "$workspace"
+
+	if [ ! -d "mv-ddr-marvell" ]; then
+		# Archive from mv_ddr-armada-atf-mainline branch
+		saveas="mv-ddr-marvell.tar.gz" \
+			url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-a881467ef0f0185e6570dd0483023fde93cbb5f5.tar.gz" \
+			fetch_file
+
+		tar -xzf "mv-ddr-marvell.tar.gz"
+	fi
+
+	echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
+	set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
+
+	popd "$workspace"
+}
diff --git a/group/tf-l1-build-plat/a80x0-default:nil b/group/tf-l1-build-plat/a80x0-default:nil
new file mode 100644
index 0000000..651719e
--- /dev/null
+++ b/group/tf-l1-build-plat/a80x0-default:nil
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+test_setup() {
+	# Parallel builds are broken for this config; so choose serial.
+	echo "Choosing serial build."
+	set_hook_var "make_j" "1"
+}
+
+pre_tf_build() {
+	pushd "$workspace"
+
+	if [ ! -d "mv-ddr-marvell" ]; then
+		# Archive from mv_ddr-armada-atf-mainline branch
+		saveas="mv-ddr-marvell.tar.gz" \
+			url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-a881467ef0f0185e6570dd0483023fde93cbb5f5.tar.gz" \
+			fetch_file
+
+		tar -xzf "mv-ddr-marvell.tar.gz"
+	fi
+
+	echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
+	set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
+
+	popd "$workspace"
+}
diff --git a/group/tf-l1-build-plat/a80x0_mcbin-default:nil b/group/tf-l1-build-plat/a80x0_mcbin-default:nil
new file mode 100644
index 0000000..651719e
--- /dev/null
+++ b/group/tf-l1-build-plat/a80x0_mcbin-default:nil
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+test_setup() {
+	# Parallel builds are broken for this config; so choose serial.
+	echo "Choosing serial build."
+	set_hook_var "make_j" "1"
+}
+
+pre_tf_build() {
+	pushd "$workspace"
+
+	if [ ! -d "mv-ddr-marvell" ]; then
+		# Archive from mv_ddr-armada-atf-mainline branch
+		saveas="mv-ddr-marvell.tar.gz" \
+			url="$tfa_downloads/mv-ddr-marvell/mv-ddr-marvell-a881467ef0f0185e6570dd0483023fde93cbb5f5.tar.gz" \
+			fetch_file
+
+		tar -xzf "mv-ddr-marvell.tar.gz"
+	fi
+
+	echo "Set MV_DDR_PATH to $workspace/mv-ddr-marvell"
+	set_hook_var "MV_DDR_PATH" "$workspace/mv-ddr-marvell"
+
+	popd "$workspace"
+}
diff --git a/group/tf-l1-build-plat/agilex-default:nil b/group/tf-l1-build-plat/agilex-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/agilex-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/arm_fpga-default:nil b/group/tf-l1-build-plat/arm_fpga-default:nil
new file mode 100644
index 0000000..976eea7
--- /dev/null
+++ b/group/tf-l1-build-plat/arm_fpga-default:nil
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl31" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/axg-atos:nil b/group/tf-l1-build-plat/axg-atos:nil
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l1-build-plat/axg-atos:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l1-build-plat/axg-default:nil b/group/tf-l1-build-plat/axg-default:nil
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l1-build-plat/axg-default:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l1-build-plat/axg-opteed:nil b/group/tf-l1-build-plat/axg-opteed:nil
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l1-build-plat/axg-opteed:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l1-build-plat/corstone700-fpga-default:nil b/group/tf-l1-build-plat/corstone700-fpga-default:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l1-build-plat/corstone700-fpga-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/corstone700-fvp-default:nil b/group/tf-l1-build-plat/corstone700-fvp-default:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l1-build-plat/corstone700-fvp-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/fvp-sgi575-tbb:nil b/group/tf-l1-build-plat/fvp-sgi575-tbb:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/fvp-sgi575-tbb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/fvp-sgm775-tbb:nil b/group/tf-l1-build-plat/fvp-sgm775-tbb:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/fvp-sgm775-tbb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/fvp-tc0-tbb:nil b/group/tf-l1-build-plat/fvp-tc0-tbb:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l1-build-plat/fvp-tc0-tbb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/fvp_ve-a5:nil b/group/tf-l1-build-plat/fvp_ve-a5:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/fvp_ve-a5:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/fvp_ve-a7:nil b/group/tf-l1-build-plat/fvp_ve-a7:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/fvp_ve-a7:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/g12a-default:nil b/group/tf-l1-build-plat/g12a-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/g12a-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/gxbb-default:nil b/group/tf-l1-build-plat/gxbb-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/gxbb-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/gxl-default:nil b/group/tf-l1-build-plat/gxl-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/gxl-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/hikey-default:nil b/group/tf-l1-build-plat/hikey-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/hikey-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/hikey-enable-pmf:nil b/group/tf-l1-build-plat/hikey-enable-pmf:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/hikey-enable-pmf:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/hikey-opteed:nil b/group/tf-l1-build-plat/hikey-opteed:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/hikey-opteed:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/hikey960-default:nil b/group/tf-l1-build-plat/hikey960-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/hikey960-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/hikey960-opteed:nil b/group/tf-l1-build-plat/hikey960-opteed:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/hikey960-opteed:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/imx8mm-default:nil b/group/tf-l1-build-plat/imx8mm-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/imx8mm-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/imx8mn-default:nil b/group/tf-l1-build-plat/imx8mn-default:nil
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l1-build-plat/imx8mn-default:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l1-build-plat/imx8mq-default:nil b/group/tf-l1-build-plat/imx8mq-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/imx8mq-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/imx8qm-default:nil b/group/tf-l1-build-plat/imx8qm-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/imx8qm-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/imx8qx-default:nil b/group/tf-l1-build-plat/imx8qx-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/imx8qx-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/k3-default:nil b/group/tf-l1-build-plat/k3-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/k3-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/ls1043-default:nil b/group/tf-l1-build-plat/ls1043-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/ls1043-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/ls1043-opteed:nil b/group/tf-l1-build-plat/ls1043-opteed:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/ls1043-opteed:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/ls1043-tspd:nil b/group/tf-l1-build-plat/ls1043-tspd:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/ls1043-tspd:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/mt8173-default:nil b/group/tf-l1-build-plat/mt8173-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/mt8173-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/mt8183-default:nil b/group/tf-l1-build-plat/mt8183-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/mt8183-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/n1sdp-default:nil b/group/tf-l1-build-plat/n1sdp-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/n1sdp-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/picopi-default:nil b/group/tf-l1-build-plat/picopi-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/picopi-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/poplar-default:nil b/group/tf-l1-build-plat/poplar-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/poplar-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/px30-default:nil b/group/tf-l1-build-plat/px30-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/px30-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/qemu-aarch32-opteed:nil b/group/tf-l1-build-plat/qemu-aarch32-opteed:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/qemu-aarch32-opteed:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/qemu-default:nil b/group/tf-l1-build-plat/qemu-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/qemu-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/qemu-gicv3:nil b/group/tf-l1-build-plat/qemu-gicv3:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/qemu-gicv3:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/qemu-opteed-tbb-enc:norun-fip.dummy b/group/tf-l1-build-plat/qemu-opteed-tbb-enc:norun-fip.dummy
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l1-build-plat/qemu-opteed-tbb-enc:norun-fip.dummy
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l1-build-plat/qemu-tbb:norun-fip.dummy b/group/tf-l1-build-plat/qemu-tbb:norun-fip.dummy
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l1-build-plat/qemu-tbb:norun-fip.dummy
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l1-build-plat/qemu_sbsa-default:nil b/group/tf-l1-build-plat/qemu_sbsa-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/qemu_sbsa-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/qemu_sbsa-stack-protector:nil b/group/tf-l1-build-plat/qemu_sbsa-stack-protector:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/qemu_sbsa-stack-protector:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/rcar-auto-opteed:nil b/group/tf-l1-build-plat/rcar-auto-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-auto-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-d3-draak:nil b/group/tf-l1-build-plat/rcar-d3-draak:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-d3-draak:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil b/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil b/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-h3n-opteed:nil b/group/tf-l1-build-plat/rcar-h3n-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-h3n-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rcar-v3m-eagle:nil b/group/tf-l1-build-plat/rcar-v3m-eagle:nil
new file mode 100644
index 0000000..b733163
--- /dev/null
+++ b/group/tf-l1-build-plat/rcar-v3m-eagle:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl2 bl31 rcar" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rk3288-default:nil b/group/tf-l1-build-plat/rk3288-default:nil
new file mode 100644
index 0000000..1f21eff
--- /dev/null
+++ b/group/tf-l1-build-plat/rk3288-default:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="bl32" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/rk3328-coreboot:nil b/group/tf-l1-build-plat/rk3328-coreboot:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/rk3328-coreboot:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/rk3328-default:nil b/group/tf-l1-build-plat/rk3328-default:nil
new file mode 100644
index 0000000..42894f4
--- /dev/null
+++ b/group/tf-l1-build-plat/rk3328-default:nil
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_tf_archive() {
+	echo "Removing bl31.bin"
+	rm -f "$archive/bl31.bin"
+	touch "$archive/bl31.bin.deleted"
+}
diff --git a/group/tf-l1-build-plat/rk3368-coreboot:nil b/group/tf-l1-build-plat/rk3368-coreboot:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/rk3368-coreboot:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/rk3368-default:nil b/group/tf-l1-build-plat/rk3368-default:nil
new file mode 100644
index 0000000..42894f4
--- /dev/null
+++ b/group/tf-l1-build-plat/rk3368-default:nil
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_tf_archive() {
+	echo "Removing bl31.bin"
+	rm -f "$archive/bl31.bin"
+	touch "$archive/bl31.bin.deleted"
+}
diff --git a/group/tf-l1-build-plat/rk3399-coreboot:nil b/group/tf-l1-build-plat/rk3399-coreboot:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/rk3399-coreboot:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/rk3399-default:nil b/group/tf-l1-build-plat/rk3399-default:nil
new file mode 100644
index 0000000..42894f4
--- /dev/null
+++ b/group/tf-l1-build-plat/rk3399-default:nil
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_tf_archive() {
+	echo "Removing bl31.bin"
+	rm -f "$archive/bl31.bin"
+	touch "$archive/bl31.bin.deleted"
+}
diff --git a/group/tf-l1-build-plat/rpi3-default:nil b/group/tf-l1-build-plat/rpi3-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/rpi3-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/rpi3-stack-protector:nil b/group/tf-l1-build-plat/rpi3-stack-protector:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/rpi3-stack-protector:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/rpi4-default:nil b/group/tf-l1-build-plat/rpi4-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/rpi4-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/stingray-default:nil b/group/tf-l1-build-plat/stingray-default:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l1-build-plat/stingray-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/stm32mp1-default:nil b/group/tf-l1-build-plat/stm32mp1-default:nil
new file mode 100644
index 0000000..a4176fb
--- /dev/null
+++ b/group/tf-l1-build-plat/stm32mp1-default:nil
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	# Only build bl1, bl2 and bl32 for this config
+	# Building 'all' fails because of older DTC version.
+	targets="bl1 bl2 bl32" set_tf_build_targets
+}
diff --git a/group/tf-l1-build-plat/stratix10-default:nil b/group/tf-l1-build-plat/stratix10-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/stratix10-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/sun50i_a64-default:nil b/group/tf-l1-build-plat/sun50i_a64-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/sun50i_a64-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/sun50i_h6-default:nil b/group/tf-l1-build-plat/sun50i_h6-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/sun50i_h6-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/synquacer-default:nil b/group/tf-l1-build-plat/synquacer-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/synquacer-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/synquacer-spm:nil b/group/tf-l1-build-plat/synquacer-spm:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/synquacer-spm:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/tegra-t132-tlkd:nil b/group/tf-l1-build-plat/tegra-t132-tlkd:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/tegra-t132-tlkd:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/tegra-t132-trusty:nil b/group/tf-l1-build-plat/tegra-t132-trusty:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/tegra-t132-trusty:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/tegra-t186-trusty:nil b/group/tf-l1-build-plat/tegra-t186-trusty:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/tegra-t186-trusty:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/tegra-t194-default:nil b/group/tf-l1-build-plat/tegra-t194-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/tegra-t194-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/tegra-t210-tlkd:nil b/group/tf-l1-build-plat/tegra-t210-tlkd:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/tegra-t210-tlkd:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/tegra-t210-trusty:nil b/group/tf-l1-build-plat/tegra-t210-trusty:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/tegra-t210-trusty:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/uniphier-default:nil b/group/tf-l1-build-plat/uniphier-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/uniphier-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/uniphier-tbb-gzip:nil b/group/tf-l1-build-plat/uniphier-tbb-gzip:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/uniphier-tbb-gzip:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/uniphier-tbb:nil b/group/tf-l1-build-plat/uniphier-tbb:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/uniphier-tbb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/uniphier-tsp:nil b/group/tf-l1-build-plat/uniphier-tsp:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/uniphier-tsp:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/versal-default:nil b/group/tf-l1-build-plat/versal-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/versal-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/versal-virt:nil b/group/tf-l1-build-plat/versal-virt:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/versal-virt:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/warp7-default:nil b/group/tf-l1-build-plat/warp7-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/warp7-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/zynqmp-default:nil b/group/tf-l1-build-plat/zynqmp-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/zynqmp-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/zynqmp-tspd-tdram:nil b/group/tf-l1-build-plat/zynqmp-tspd-tdram:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/zynqmp-tspd-tdram:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-build-plat/zynqmp-tspd:nil b/group/tf-l1-build-plat/zynqmp-tspd:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-plat/zynqmp-tspd:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-check-docs/build-docs:nil b/group/tf-l1-check-docs/build-docs:nil
new file mode 100644
index 0000000..904c1fb
--- /dev/null
+++ b/group/tf-l1-check-docs/build-docs:nil
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	targets="doc" set_tf_build_targets
+}
+
diff --git a/group/tf-l2-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+8_4-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+8_4-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+8_4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+regreset-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+regreset-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+regreset-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-aarch32/fvp-aarch32-gicv2:fvp-linux32-dtb.aarch32.gicv2-fip.uboot32-aemv8a_revb.aarch32.gicv2-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-gicv2:fvp-linux32-dtb.aarch32.gicv2-fip.uboot32-aemv8a_revb.aarch32.gicv2-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-gicv2:fvp-linux32-dtb.aarch32.gicv2-fip.uboot32-aemv8a_revb.aarch32.gicv2-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32-fip.uboot32-cortexa32x4.rstspmin-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32-fip.uboot32-cortexa32x4.rstspmin-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32-fip.uboot32-cortexa32x4.rstspmin-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+memprotect-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+memprotect-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+memprotect-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-aarch32/fvp-aarch32-stack-protector:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-stack-protector:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-stack-protector:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-aarch32/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32 b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-aarch32/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-tbb-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-bl2_el3/fvp-aarch32-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug b/group/tf-l2-boot-tests-bl2_el3/fvp-aarch32-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-bl2_el3/fvp-aarch32-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-bl2_el3/fvp-aarch32-tbb-mbedtls-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug b/group/tf-l2-boot-tests-bl2_el3/fvp-aarch32-tbb-mbedtls-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-bl2_el3/fvp-aarch32-tbb-mbedtls-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug b/group/tf-l2-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-bl2_el3/fvp-tbb-mbedtls-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug b/group/tf-l2-boot-tests-bl2_el3/fvp-tbb-mbedtls-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-bl2_el3/fvp-tbb-mbedtls-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa53x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa53x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa57x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa57x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa57x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4a53x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4a53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4a53x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65x4-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-1x2t:fvp-linux-fip.uboot-neoverse_e1x1-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-1x2t:fvp-linux-fip.uboot-neoverse_e1x1-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-1x2t:fvp-linux-fip.uboot-neoverse_e1x1-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-2x2t:fvp-linux-fip.uboot-neoverse_e1x2-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-2x2t:fvp-linux-fip.uboot-neoverse_e1x2-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-2x2t:fvp-linux-fip.uboot-neoverse_e1x2-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-4x2t:fvp-linux-fip.uboot-neoverse_e1x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-4x2t:fvp-linux-fip.uboot-neoverse_e1x4-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-4x2t:fvp-linux-fip.uboot-neoverse_e1x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8x2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65aex8-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8x2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65aex8-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8x2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65aex8-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a76x2-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a76x2-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a76x2-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76aex4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76aex4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76aex4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa77x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa77x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa77x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a75x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a75x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a75x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa75x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa75x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa75x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-rst-bl31:fvp-linux.rst31-dtb-fip.uboot-cortexa57x4a53x4.rst31-debug b/group/tf-l2-boot-tests-cortex/fvp-rst-bl31:fvp-linux.rst31-dtb-fip.uboot-cortexa57x4a53x4.rst31-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-rst-bl31:fvp-linux.rst31-dtb-fip.uboot-cortexa57x4a53x4.rst31-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug b/group/tf-l2-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime-mbedtls:juno-linux.uboot+aarch32-rt32 b/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime-mbedtls:juno-linux.uboot+aarch32-rt32
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime-mbedtls:juno-linux.uboot+aarch32-rt32
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime:juno-linux.uboot+aarch32-rt32-debug b/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime:juno-linux.uboot+aarch32-rt32-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime:juno-linux.uboot+aarch32-rt32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-juno/juno-all-cpu-reset-ops:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-all-cpu-reset-ops:juno-linux.uboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-all-cpu-reset-ops:juno-linux.uboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-debug b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-juno/juno-mbedtls-rsa-opteed:juno-linux.optee b/group/tf-l2-boot-tests-juno/juno-mbedtls-rsa-opteed:juno-linux.optee
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-mbedtls-rsa-opteed:juno-linux.optee
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-juno/juno-no-cohmem:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-no-cohmem:juno-linux.uboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-no-cohmem:juno-linux.uboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-boot-tests-juno/juno-tbb-mbedtls-romlib,juno-default:juno-tftf-romlib b/group/tf-l2-boot-tests-juno/juno-tbb-mbedtls-romlib,juno-default:juno-tftf-romlib
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-tbb-mbedtls-romlib,juno-default:juno-tftf-romlib
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-debug b/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls:juno-linux.uboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls:juno-linux.uboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-latest/fvp-default:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-debug b/group/tf-l2-boot-tests-latest/fvp-default:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-latest/fvp-default:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-latest/fvp-tspd:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug b/group/tf-l2-boot-tests-latest/fvp-tspd:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-latest/fvp-tspd:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch64-stack-protector:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-aarch64-stack-protector:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-aarch64-stack-protector:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-arm-bl31-in-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-arm-bl31-in-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-arm-bl31-in-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-cas-spinlock,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_3-debug b/group/tf-l2-boot-tests-misc/fvp-cas-spinlock,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_3-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-cas-spinlock,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_3-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-debug b/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi b/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-default-clang,fvp-default:fvp-tftf-fip.tftf-aemv8a b/group/tf-l2-boot-tests-misc/fvp-default-clang,fvp-default:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default-clang,fvp-default:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-default-clang-bfd,fvp-default:fvp-tftf-fip.tftf-aemv8a b/group/tf-l2-boot-tests-misc/fvp-default-clang-bfd,fvp-default:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default-clang-bfd,fvp-default:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-early-d-cache,fvp-default:fvp-tftf-fip.tftf-aem8a.singlecluster-debug b/group/tf-l2-boot-tests-misc/fvp-early-d-cache,fvp-default:fvp-tftf-fip.tftf-aem8a.singlecluster-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-early-d-cache,fvp-default:fvp-tftf-fip.tftf-aem8a.singlecluster-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-gcc-lto,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-gcc-lto,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-gcc-lto,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-gicv4:fvp-linux-dtb.1t-fip.uboot-aemv8a.gicv4 b/group/tf-l2-boot-tests-misc/fvp-gicv4:fvp-linux-dtb.1t-fip.uboot-aemv8a.gicv4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-gicv4:fvp-linux-dtb.1t-fip.uboot-aemv8a.gicv4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-debug b/group/tf-l2-boot-tests-misc/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug b/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-tspd-aarch64-only:fvp-linux-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug b/group/tf-l2-boot-tests-misc/fvp-tspd-aarch64-only:fvp-linux-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tspd-aarch64-only:fvp-linux-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-tspd-debug b/group/tf-l2-boot-tests-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-tspd-tsp-async-ehf,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd-debug b/group/tf-l2-boot-tests-misc/fvp-tspd-tsp-async-ehf,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tspd-tsp-async-ehf,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-fip.tftf-aemv8a.ubsan_test-debug b/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-fip.tftf-aemv8a.ubsan_test-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-fip.tftf-aemv8a.ubsan_test-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.memprotect-debug b/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.memprotect-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.memprotect-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug b/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-tspd-aarch64-only-with-nstimer:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug b/group/tf-l2-boot-tests-rootfs/fvp-tspd-aarch64-only-with-nstimer:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-tspd-aarch64-only-with-nstimer:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-tspd-tbb-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tbb-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tbb-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb-fip.uboot-aemva-tspd-debug b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb-fip.uboot-aemva-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb-fip.uboot-aemva-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a-tspd-debug b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee b/group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm,fvp-default:fvp-spm b/group/tf-l2-boot-tests-spm/fvp-spm,fvp-default:fvp-spm
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-boot-tests-spm/fvp-spm,fvp-default:fvp-spm
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm,fvp-default:fvp-spm.linux b/group/tf-l2-boot-tests-spm/fvp-spm,fvp-default:fvp-spm.linux
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-boot-tests-spm/fvp-spm,fvp-default:fvp-spm.linux
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a-debug b/group/tf-l2-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug b/group/tf-l2-boot-tests-spm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-spm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-tbb,fvp-default:fvp-spm b/group/tf-l2-boot-tests-spm/fvp-spm-tbb,fvp-default:fvp-spm
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l2-boot-tests-spm/fvp-spm-tbb,fvp-default:fvp-spm
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-tbb-dualroot,fvp-default:fvp-spm b/group/tf-l2-boot-tests-spm/fvp-spm-tbb-dualroot,fvp-default:fvp-spm
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l2-boot-tests-spm/fvp-spm-tbb-dualroot,fvp-default:fvp-spm
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-build-fvp/fvp-aarch32-enable-runtime-instr:nil b/group/tf-l2-build-fvp/fvp-aarch32-enable-runtime-instr:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-aarch32-enable-runtime-instr:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-aarch32-tbb-mbedtls-ecdsa:nil b/group/tf-l2-build-fvp/fvp-aarch32-tbb-mbedtls-ecdsa:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-aarch32-tbb-mbedtls-ecdsa:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil b/group/tf-l2-build-fvp/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-boot-el3-payload:nil b/group/tf-l2-build-fvp/fvp-boot-el3-payload:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-boot-el3-payload:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-enable-runtime-instr:nil b/group/tf-l2-build-fvp/fvp-enable-runtime-instr:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-enable-runtime-instr:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-ext-pstate-ea-el3:nil b/group/tf-l2-build-fvp/fvp-ext-pstate-ea-el3:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-ext-pstate-ea-el3:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-hw-assisted-coherency:nil b/group/tf-l2-build-fvp/fvp-hw-assisted-coherency:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-hw-assisted-coherency:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-misc-features:nil b/group/tf-l2-build-fvp/fvp-misc-features:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-misc-features:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-no-cohmem-crash-report:nil b/group/tf-l2-build-fvp/fvp-no-cohmem-crash-report:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-no-cohmem-crash-report:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-no-cohmem:nil b/group/tf-l2-build-fvp/fvp-no-cohmem:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-no-cohmem:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tbb-mbedtls-ecdsa-sha512:nil b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-ecdsa-sha512:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-ecdsa-sha512:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tbb-mbedtls-ecdsa:nil b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-ecdsa:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-ecdsa:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tbb-mbedtls-no-cohmem:nil b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-no-cohmem:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-no-cohmem:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem:nil b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async-irq2el3-no-cohmem:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async-irq2el3:nil b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async-irq2el3:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async-irq2el3:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async:nil b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tbb-mbedtls-tsp-async:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-trustyd-gensvc:nil b/group/tf-l2-build-fvp/fvp-trustyd-gensvc:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-trustyd-gensvc:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-trustyd:nil b/group/tf-l2-build-fvp/fvp-trustyd:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-trustyd:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-aarch64-only-with-nstimer:nil b/group/tf-l2-build-fvp/fvp-tspd-aarch64-only-with-nstimer:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-aarch64-only-with-nstimer:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-aarch64-only:nil b/group/tf-l2-build-fvp/fvp-tspd-aarch64-only:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-aarch64-only:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-gicv2-symmetric-model:nil b/group/tf-l2-build-fvp/fvp-tspd-gicv2-symmetric-model:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-gicv2-symmetric-model:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-irq2el3:nil b/group/tf-l2-build-fvp/fvp-tspd-irq2el3:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-irq2el3:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-quad-cluster:nil b/group/tf-l2-build-fvp/fvp-tspd-quad-cluster:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-quad-cluster:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-rst-bl31:nil b/group/tf-l2-build-fvp/fvp-tspd-rst-bl31:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-rst-bl31:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-tbb-mbedtls:nil b/group/tf-l2-build-fvp/fvp-tspd-tbb-mbedtls:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-tbb-mbedtls:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-tsp-async-crash-report:nil b/group/tf-l2-build-fvp/fvp-tspd-tsp-async-crash-report:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-tsp-async-crash-report:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-tsp-async-irq2el3-no-cohmem:nil b/group/tf-l2-build-fvp/fvp-tspd-tsp-async-irq2el3-no-cohmem:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-tsp-async-irq2el3-no-cohmem:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-tsp-async-irq2el3:nil b/group/tf-l2-build-fvp/fvp-tspd-tsp-async-irq2el3:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-tsp-async-irq2el3:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-tsp-async:nil b/group/tf-l2-build-fvp/fvp-tspd-tsp-async:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-tsp-async:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-tsp-dram:nil b/group/tf-l2-build-fvp/fvp-tspd-tsp-dram:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-tsp-dram:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-fvp/fvp-tspd-tsp-tdram:nil b/group/tf-l2-build-fvp/fvp-tspd-tsp-tdram:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-fvp/fvp-tspd-tsp-tdram:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-all-cpu-reset-ops:nil b/group/tf-l2-build-juno/juno-all-cpu-reset-ops:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-all-cpu-reset-ops:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-boot-el3-payload:nil b/group/tf-l2-build-juno/juno-boot-el3-payload:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-boot-el3-payload:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-mbedtls-ecdsa-opteed:nil b/group/tf-l2-build-juno/juno-mbedtls-ecdsa-opteed:nil
new file mode 100644
index 0000000..b4f830c
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-mbedtls-ecdsa-opteed:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-build-juno/juno-mbedtls-rsa-opteed:nil b/group/tf-l2-build-juno/juno-mbedtls-rsa-opteed:nil
new file mode 100644
index 0000000..b4f830c
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-mbedtls-rsa-opteed:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-build-juno/juno-no-cohmem:nil b/group/tf-l2-build-juno/juno-no-cohmem:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-no-cohmem:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-no-scmi:nil b/group/tf-l2-build-juno/juno-no-scmi:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-no-scmi:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-pl33:nil b/group/tf-l2-build-juno/juno-pl33:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-pl33:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tbb-cryptocell:nil b/group/tf-l2-build-juno/juno-tbb-cryptocell:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tbb-cryptocell:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tbb-mbedtls-ecdsa:nil b/group/tf-l2-build-juno/juno-tbb-mbedtls-ecdsa:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tbb-mbedtls-ecdsa:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil b/group/tf-l2-build-juno/juno-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tsp-no-cohmem-irq2el3:nil b/group/tf-l2-build-juno/juno-tsp-no-cohmem-irq2el3:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tsp-no-cohmem-irq2el3:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3:nil b/group/tf-l2-build-juno/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tspd-tbb-mbedtls:nil b/group/tf-l2-build-juno/juno-tspd-tbb-mbedtls:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tspd-tbb-mbedtls:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tspd-tsp-async-irq2el3-crash-report:nil b/group/tf-l2-build-juno/juno-tspd-tsp-async-irq2el3-crash-report:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tspd-tsp-async-irq2el3-crash-report:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tspd-tsp-dram:nil b/group/tf-l2-build-juno/juno-tspd-tsp-dram:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tspd-tsp-dram:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-build-juno/juno-tzmp-mbedtls-ecdsa-opteed:nil b/group/tf-l2-build-juno/juno-tzmp-mbedtls-ecdsa-opteed:nil
new file mode 100644
index 0000000..b4f830c
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tzmp-mbedtls-ecdsa-opteed:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-ecdsa-with-ecdsa-rotpk:nil b/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-ecdsa-with-ecdsa-rotpk:nil
new file mode 100644
index 0000000..b4f830c
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-ecdsa-with-ecdsa-rotpk:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-ecdsa-with-rsa-rotpk:nil b/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-ecdsa-with-rsa-rotpk:nil
new file mode 100644
index 0000000..b4f830c
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-ecdsa-with-rsa-rotpk:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-opteed:nil b/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-opteed:nil
new file mode 100644
index 0000000..b4f830c
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tzmp-mbedtls-rsa-opteed:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-build-juno/juno-tzmp1:nil b/group/tf-l2-build-juno/juno-tzmp1:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-build-juno/juno-tzmp1:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-aarch32-default:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-aarch32-default:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-aarch32-default:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-aarch32-enable-runtime-instr:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-aarch32-enable-runtime-instr:coverity-tf-misra.diff
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-aarch32-enable-runtime-instr:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-aarch32-rst-to-sp-min:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-aarch32-rst-to-sp-min:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-aarch32-rst-to-sp-min:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-boot-el3-payload:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-boot-el3-payload:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-boot-el3-payload:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-default:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-default:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-default:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-enable-runtime-instr:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-enable-runtime-instr:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-enable-runtime-instr:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-ext-pstate-ea-el3:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-ext-pstate-ea-el3:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-ext-pstate-ea-el3:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-no-cohmem:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-no-cohmem:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-no-cohmem:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-opteed:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-opteed:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-opteed:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-rst-bl31:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-rst-bl31:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-rst-bl31:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-tspd-gicv2-symmetric-model:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-tspd-gicv2-symmetric-model:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-tspd-gicv2-symmetric-model:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-tspd-irq2el3:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-tspd-irq2el3:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-tspd-irq2el3:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-tspd-quad-cluster:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-tspd-quad-cluster:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-tspd-quad-cluster:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-tspd-tbb-mbedtls:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-tspd-tbb-mbedtls:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-tspd-tbb-mbedtls:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-tspd-tsp-async:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-tspd-tsp-async:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-tspd-tsp-async:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/fvp-tspd:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-tspd:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/fvp-tspd:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min-enable-runtime-instr:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min-enable-runtime-instr:coverity-tf-misra.diff
new file mode 100644
index 0000000..2a38382
--- /dev/null
+++ b/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min-enable-runtime-instr:coverity-tf-misra.diff
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	# Only build bl32 target for this config
+	targets="bl32" set_tf_build_targets
+}
diff --git a/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min:coverity-tf-misra.diff
new file mode 100644
index 0000000..e73229c
--- /dev/null
+++ b/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min:coverity-tf-misra.diff
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tf_build() {
+	# Only build bl32 target for this config
+	targets="bl32" set_tf_build_targets
+}
diff --git a/group/tf-l2-coverity-misra/juno-default:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/juno-default:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/juno-default:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-coverity-misra/juno-tspd:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/juno-tspd:coverity-tf-misra.diff
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-coverity-misra/juno-tspd:coverity-tf-misra.diff
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/a5ds-error-deprecated:nil b/group/tf-l2-error-deprecated/a5ds-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/a5ds-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/corstone700-error-deprecated:nil b/group/tf-l2-error-deprecated/corstone700-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/corstone700-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/fvp-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/fvp-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/fvp-rde1edge-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp-rde1edge-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/fvp-rde1edge-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/fvp-rdn1edge-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp-rdn1edge-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/fvp-rdn1edge-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/fvp-sgi575-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp-sgi575-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/fvp-sgi575-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/fvp-sgm775-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp-sgm775-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/fvp-sgm775-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/fvp_ve-a5-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp_ve-a5-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/fvp_ve-a5-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/fvp_ve-a7-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp_ve-a7-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/fvp_ve-a7-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/juno-error-deprecated:nil b/group/tf-l2-error-deprecated/juno-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/juno-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-error-deprecated/n1sdp-error-deprecated:nil b/group/tf-l2-error-deprecated/n1sdp-error-deprecated:nil
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-error-deprecated/n1sdp-error-deprecated:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-aarch32-default:scan_build-tf b/group/tf-l2-scan-build/fvp-aarch32-default:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-aarch32-default:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-aarch32-enable-runtime-instr:scan_build-tf b/group/tf-l2-scan-build/fvp-aarch32-enable-runtime-instr:scan_build-tf
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-aarch32-enable-runtime-instr:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-aarch32-rst-to-sp-min:scan_build-tf b/group/tf-l2-scan-build/fvp-aarch32-rst-to-sp-min:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-aarch32-rst-to-sp-min:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-boot-el3-payload:scan_build-tf b/group/tf-l2-scan-build/fvp-boot-el3-payload:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-boot-el3-payload:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-default:scan_build-tf b/group/tf-l2-scan-build/fvp-default:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-default:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-enable-runtime-instr:scan_build-tf b/group/tf-l2-scan-build/fvp-enable-runtime-instr:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-enable-runtime-instr:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-ext-pstate-ea-el3:scan_build-tf b/group/tf-l2-scan-build/fvp-ext-pstate-ea-el3:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-ext-pstate-ea-el3:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-no-cohmem:scan_build-tf b/group/tf-l2-scan-build/fvp-no-cohmem:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-no-cohmem:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-opteed:scan_build-tf b/group/tf-l2-scan-build/fvp-opteed:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-opteed:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-rst-bl31:scan_build-tf b/group/tf-l2-scan-build/fvp-rst-bl31:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-rst-bl31:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-tspd-gicv2-symmetric-model:scan_build-tf b/group/tf-l2-scan-build/fvp-tspd-gicv2-symmetric-model:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-tspd-gicv2-symmetric-model:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-tspd-irq2el3:scan_build-tf b/group/tf-l2-scan-build/fvp-tspd-irq2el3:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-tspd-irq2el3:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-tspd-quad-cluster:scan_build-tf b/group/tf-l2-scan-build/fvp-tspd-quad-cluster:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-tspd-quad-cluster:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-tspd-tbb-mbedtls:scan_build-tf b/group/tf-l2-scan-build/fvp-tspd-tbb-mbedtls:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-tspd-tbb-mbedtls:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/fvp-tspd:scan_build-tf b/group/tf-l2-scan-build/fvp-tspd:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/fvp-tspd:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/juno-aarch32-rst-to-sp-min-enable-runtime-instr:scan_build-tf b/group/tf-l2-scan-build/juno-aarch32-rst-to-sp-min-enable-runtime-instr:scan_build-tf
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l2-scan-build/juno-aarch32-rst-to-sp-min-enable-runtime-instr:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/juno-aarch32-rst-to-sp-min:scan_build-tf b/group/tf-l2-scan-build/juno-aarch32-rst-to-sp-min:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/juno-aarch32-rst-to-sp-min:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/juno-default:scan_build-tf b/group/tf-l2-scan-build/juno-default:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/juno-default:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-scan-build/juno-tspd:scan_build-tf b/group/tf-l2-scan-build/juno-tspd:scan_build-tf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-scan-build/juno-tspd:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rde1edge-debug b/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rde1edge-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rde1edge-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb:fvp-linux.sgi-fip.sgi-rde1edge-debug b/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb:fvp-linux.sgi-fip.sgi-rde1edge-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb:fvp-linux.sgi-fip.sgi-rde1edge-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf-fip.tftf-rdn1edge b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf-fip.tftf-rdn1edge
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf-fip.tftf-rdn1edge
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rdn1edge-debug b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rdn1edge-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rdn1edge-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf-fip.tftf-sgi575 b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf-fip.tftf-sgi575
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf-fip.tftf-sgi575
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-css/fvp-sgi575-tbb-dualroot:fvp-linux.sgi-fip.sgi-sgi575-debug b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb-dualroot:fvp-linux.sgi-fip.sgi-sgi575-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb-dualroot:fvp-linux.sgi-fip.sgi-sgi575-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-css/fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-css/fvp-tc0-tbb:fvp-linux.tc0-fip.tc0-tc0-debug b/group/tf-l3-boot-tests-css/fvp-tc0-tbb:fvp-linux.tc0-fip.tc0-tc0-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-tc0-tbb:fvp-linux.tc0-fip.tc0-tc0-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch32-roxlattables,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_panic-debug b/group/tf-l3-boot-tests-misc/fvp-aarch32-roxlattables,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_panic-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch32-roxlattables,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_panic-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32 b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug
new file mode 100644
index 0000000..1e513d8
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Cache state modelling is disabled for this test as this particular TBBR config
+# thrashes the I-cache hard, leading to ~60% of CPU time spent in the host kernel
+# switching the pages responsible for the I-cache from writable to executable and
+# back again.
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug b/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_panic-debug b/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_panic-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_panic-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-no-optimize-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-no-optimize-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-no-optimize-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a b/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/juno-no-optimize-default:juno-linux.uboot b/group/tf-l3-boot-tests-misc/juno-no-optimize-default:juno-linux.uboot
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/juno-no-optimize-default:juno-linux.uboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/juno-tbb-mbedtls-ecdsa:juno-linux.uboot b/group/tf-l3-boot-tests-misc/juno-tbb-mbedtls-ecdsa:juno-linux.uboot
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/juno-tbb-mbedtls-ecdsa:juno-linux.uboot
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.fi-debug b/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.fi-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.fi-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug b/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug
new file mode 100644
index 0000000..004428e
--- /dev/null
+++ b/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_fetch_tf_resource() {
+	uart="1" set_expect_variable "tftf_fault_msg" "Injected Uncontainable Error"
+}
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l3-code-coverage/fvp-aarch64-sdei-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-aarch64-sdei-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-aarch64-sdei-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-default-cc,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve.bmcov-debug b/group/tf-l3-code-coverage/fvp-default-cc,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-default-cc,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu.bmcov-debug b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu.bmcov-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-debug b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-debug b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-default-cc,fvp-xlat-v2:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-default-cc,fvp-xlat-v2:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-default-cc,fvp-xlat-v2:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-enable-runtime-instr-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-enable-runtime-instr-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-enable-runtime-instr-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-ext-pstate-ea-el3-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-ext-pstate-ea-el3-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-ext-pstate-ea-el3-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-pl33-cc,fvp-default:fvp-tftf-aemv8a.pl33.bmcov-debug b/group/tf-l3-code-coverage/fvp-pl33-cc,fvp-default:fvp-tftf-aemv8a.pl33.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-pl33-cc,fvp-default:fvp-tftf-aemv8a.pl33.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-spm-mm-cc,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric.bmcov-debug b/group/tf-l3-code-coverage/fvp-spm-mm-cc,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric.bmcov-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-spm-mm-cc,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-spm-mm-cc,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore.bmcov-debug b/group/tf-l3-code-coverage/fvp-spm-mm-cc,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore.bmcov-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-spm-mm-cc,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd-debug b/group/tf-l3-code-coverage/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd-debug b/group/tf-l3-code-coverage/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-code-coverage/fvp-tspd-tbb-mbedtls-pauth-cc,fvp-fwu-pauth:fvp-tftf.fwu-aemv8a.8_5.bmcov-debug b/group/tf-l3-code-coverage/fvp-tspd-tbb-mbedtls-pauth-cc,fvp-fwu-pauth:fvp-tftf.fwu-aemv8a.8_5.bmcov-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-code-coverage/fvp-tspd-tbb-mbedtls-pauth-cc,fvp-fwu-pauth:fvp-tftf.fwu-aemv8a.8_5.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr b/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr-r1 b/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr-r1
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr-r1
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr-r2 b/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr-r2
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-psci-lava-instr/juno-aarch32-el3-runtime,juno-aarch32-runtime-instrumentation:juno-tftf+aarch32-rt32.instr-r2
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf b/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf-r1 b/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf-r1
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf-r1
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf-r2 b/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf-r2
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf-r2
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-reboot-juno/juno-aarch32-el3-runtime:juno-linux.reboot+aarch32-rt32-debug b/group/tf-reboot-juno/juno-aarch32-el3-runtime:juno-linux.reboot+aarch32-rt32-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-reboot-juno/juno-aarch32-el3-runtime:juno-linux.reboot+aarch32-rt32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-reboot-juno/juno-default:juno-linux.reboot b/group/tf-reboot-juno/juno-default:juno-linux.reboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-reboot-juno/juno-default:juno-linux.reboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-NVM_reboot:nil b/group/tftf-l1-build/nil,fvp-NVM_reboot:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-NVM_reboot:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-aarch32-default:nil b/group/tftf-l1-build/nil,fvp-aarch32-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-aarch32-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-arm-state-switch:nil b/group/tftf-l1-build/nil,fvp-arm-state-switch:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-arm-state-switch:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-boot-req:nil b/group/tftf-l1-build/nil,fvp-boot-req:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-boot-req:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-cpu-extensions:nil b/group/tftf-l1-build/nil,fvp-cpu-extensions:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-cpu-extensions:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-default:nil b/group/tftf-l1-build/nil,fvp-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-el3-power-state:nil b/group/tftf-l1-build/nil,fvp-el3-power-state:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-el3-power-state:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-extensive:nil b/group/tftf-l1-build/nil,fvp-extensive:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-extensive:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-fwu:nil b/group/tftf-l1-build/nil,fvp-fwu:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-fwu:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-performance:nil b/group/tftf-l1-build/nil,fvp-performance:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-performance:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-psci-extensive:nil b/group/tftf-l1-build/nil,fvp-psci-extensive:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-psci-extensive:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-psci:nil b/group/tftf-l1-build/nil,fvp-psci:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-psci:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-runtime-instrumentation:nil b/group/tftf-l1-build/nil,fvp-runtime-instrumentation:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-runtime-instrumentation:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-sdei:nil b/group/tftf-l1-build/nil,fvp-sdei:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-sdei:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-single-fault:nil b/group/tftf-l1-build/nil,fvp-single-fault:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-single-fault:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-standard:nil b/group/tftf-l1-build/nil,fvp-standard:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-standard:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-template:nil b/group/tftf-l1-build/nil,fvp-template:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-template:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-tftf-validation:nil b/group/tftf-l1-build/nil,fvp-tftf-validation:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-tftf-validation:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-tsp:nil b/group/tftf-l1-build/nil,fvp-tsp:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-tsp:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,fvp-uncontainable:nil b/group/tftf-l1-build/nil,fvp-uncontainable:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,fvp-uncontainable:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,hikey960-default:nil b/group/tftf-l1-build/nil,hikey960-default:nil
new file mode 100644
index 0000000..4299af5
--- /dev/null
+++ b/group/tftf-l1-build/nil,hikey960-default:nil
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tftf_build() {
+	# Build only TFTF - avoid el3 payload since Hikey960's TF-A-Tests port
+	# doesn't support it
+	targets="tftf" set_tftf_build_targets
+}
diff --git a/group/tftf-l1-build/nil,juno-aarch32-extensive:nil b/group/tftf-l1-build/nil,juno-aarch32-extensive:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-aarch32-extensive:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-arm-state-switch:nil b/group/tftf-l1-build/nil,juno-arm-state-switch:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-arm-state-switch:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-boot-req:nil b/group/tftf-l1-build/nil,juno-boot-req:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-boot-req:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-cpu-extensions:nil b/group/tftf-l1-build/nil,juno-cpu-extensions:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-cpu-extensions:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-default:nil b/group/tftf-l1-build/nil,juno-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-el3-power-state:nil b/group/tftf-l1-build/nil,juno-el3-power-state:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-el3-power-state:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-extensive:nil b/group/tftf-l1-build/nil,juno-extensive:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-extensive:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-fwu:nil b/group/tftf-l1-build/nil,juno-fwu:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-fwu:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-manual:nil b/group/tftf-l1-build/nil,juno-manual:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-manual:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-performance:nil b/group/tftf-l1-build/nil,juno-performance:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-performance:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-psci-extensive:nil b/group/tftf-l1-build/nil,juno-psci-extensive:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-psci-extensive:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-psci:nil b/group/tftf-l1-build/nil,juno-psci:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-psci:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-runtime-instrumentation:nil b/group/tftf-l1-build/nil,juno-runtime-instrumentation:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-runtime-instrumentation:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-sdei:nil b/group/tftf-l1-build/nil,juno-sdei:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-sdei:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-single-fault:nil b/group/tftf-l1-build/nil,juno-single-fault:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-single-fault:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-standard:nil b/group/tftf-l1-build/nil,juno-standard:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-standard:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-template:nil b/group/tftf-l1-build/nil,juno-template:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-template:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-tftf-validation:nil b/group/tftf-l1-build/nil,juno-tftf-validation:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-tftf-validation:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-tsp:nil b/group/tftf-l1-build/nil,juno-tsp:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-tsp:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-build/nil,juno-uncontainable:nil b/group/tftf-l1-build/nil,juno-uncontainable:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-build/nil,juno-uncontainable:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-check-docs/nil,build-docs:nil b/group/tftf-l1-check-docs/nil,build-docs:nil
new file mode 100644
index 0000000..c2a7067
--- /dev/null
+++ b/group/tftf-l1-check-docs/nil,build-docs:nil
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+pre_tftf_build() {
+	targets="doc" set_tftf_build_targets
+}
diff --git a/group/tftf-l1-fvp/fvp-bl31-separate-nobits,fvp-default:fvp-tftf-fip.tftf-aemv8a b/group/tftf-l1-fvp/fvp-bl31-separate-nobits,fvp-default:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-bl31-separate-nobits,fvp-default:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemva-tspd b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemva-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemva-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-juno/juno-aarch32-el3-runtime,juno-aarch32-default:juno-tftf+aarch32-rt32 b/group/tftf-l1-juno/juno-aarch32-el3-runtime,juno-aarch32-default:juno-tftf+aarch32-rt32
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-juno/juno-aarch32-el3-runtime,juno-aarch32-default:juno-tftf+aarch32-rt32
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-juno/juno-aarch32-el3-runtime,juno-aarch32-reboot:juno-tftf+aarch32-rt32 b/group/tftf-l1-juno/juno-aarch32-el3-runtime,juno-aarch32-reboot:juno-tftf+aarch32-rt32
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-juno/juno-aarch32-el3-runtime,juno-aarch32-reboot:juno-tftf+aarch32-rt32
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-juno/juno-default,juno-default:juno-tftf b/group/tftf-l1-juno/juno-default,juno-default:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-juno/juno-default,juno-default:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-juno/juno-default,juno-reboot:juno-tftf b/group/tftf-l1-juno/juno-default,juno-reboot:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-juno/juno-default,juno-reboot:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-juno/juno-sdei,juno-default:juno-tftf b/group/tftf-l1-juno/juno-sdei,juno-default:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-juno/juno-sdei,juno-default:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf b/group/tftf-l1-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l1-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l1-spm/nil,nil:nil b/group/tftf-l1-spm/nil,nil:nil
new file mode 100644
index 0000000..96f9a95
--- /dev/null
+++ b/group/tftf-l1-spm/nil,nil:nil
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# The file is needed to keep tftf-l1-spm group
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4 b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4 b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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-default,fvp-extensive:fvp-tftf-fip.tftf-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-default,fvp-extensive:fvp-tftf-fip.tftf-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a-tspd b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemva-tspd b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemva-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-aemva-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4-tspd b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-fvp/fvp-tspd,fvp-extensive:fvp-tftf-fip.tftf-foundationv8-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-aarch32-el3-runtime,juno-aarch32-extensive:juno-tftf+aarch32-rt32 b/group/tftf-l2-extensive-tests-juno/juno-aarch32-el3-runtime,juno-aarch32-extensive:juno-tftf+aarch32-rt32
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-aarch32-el3-runtime,juno-aarch32-extensive:juno-tftf+aarch32-rt32
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-all-cpu-reset-ops,juno-extensive:juno-tftf b/group/tftf-l2-extensive-tests-juno/juno-all-cpu-reset-ops,juno-extensive:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-all-cpu-reset-ops,juno-extensive:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-default,juno-extensive:juno-tftf b/group/tftf-l2-extensive-tests-juno/juno-default,juno-extensive:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-default,juno-extensive:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-no-cohmem,juno-extensive:juno-tftf b/group/tftf-l2-extensive-tests-juno/juno-no-cohmem,juno-extensive:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-no-cohmem,juno-extensive:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-tspd,juno-extensive:juno-tftf b/group/tftf-l2-extensive-tests-juno/juno-tspd,juno-extensive:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-tspd,juno-extensive:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-tspd-tbb-mbedtls,juno-extensive:juno-tftf b/group/tftf-l2-extensive-tests-juno/juno-tspd-tbb-mbedtls,juno-extensive:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-tspd-tbb-mbedtls,juno-extensive:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3,juno-extensive:juno-tftf b/group/tftf-l2-extensive-tests-juno/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3,juno-extensive:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-tspd-tbb-mbedtls-no-cohmem-irq2el3,juno-extensive:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-tspd-tsp-async-irq2el3-crash-report,juno-extensive:juno-tftf b/group/tftf-l2-extensive-tests-juno/juno-tspd-tsp-async-irq2el3-crash-report,juno-extensive:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-tspd-tsp-async-irq2el3-crash-report,juno-extensive:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-extensive-tests-juno/juno-tspd-tsp-dram,juno-extensive:juno-tftf b/group/tftf-l2-extensive-tests-juno/juno-tspd-tsp-dram,juno-extensive:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-extensive-tests-juno/juno-tspd-tsp-dram,juno-extensive:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-aarch32-sec-int-fconf,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug b/group/tftf-l2-fvp-auxiliary/fvp-aarch32-sec-int-fconf,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-aarch32-sec-int-fconf,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-aarch64-sdei-fconf,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp-auxiliary/fvp-aarch64-sdei-fconf,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-aarch64-sdei-fconf,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-aarch64-sec-int-fconf,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp-auxiliary/fvp-aarch64-sec-int-fconf,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-aarch64-sec-int-fconf,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa35x4 b/group/tftf-l2-fvp-auxiliary/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa35x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa35x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4 b/group/tftf-l2-fvp-auxiliary/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemva b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemva
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-aemva
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-cortexa35x4 b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-cortexa35x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-cortexa35x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4 b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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,fvp-default:fvp-tftf-fip.tftf-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-no-cohmem,fvp-default:fvp-tftf-fip.tftf-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.assymetric b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.assymetric
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.assymetric
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.singlecore b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.singlecore
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.singlecore
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemva b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemva
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemva
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa35x4 b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa35x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa35x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa57x4a53x4 b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa57x4a53x4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa57x4a53x4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-opteed,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-tspd b/group/tftf-l2-fvp-auxiliary/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-auxiliary/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd b/group/tftf-l2-fvp-auxiliary/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-auxiliary/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a76x2-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a76x2-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a76x2-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa76aex4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa76aex4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa76aex4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-neoverse_n1x4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-neoverse_n1x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-neoverse_n1x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-2t,fvp-2t:fvp-dtb.dyn.2t-tftf-fip.tftf-cortexa65x4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-2t,fvp-2t:fvp-dtb.dyn.2t-tftf-fip.tftf-cortexa65x4-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-2t,fvp-2t:fvp-dtb.dyn.2t-tftf-fip.tftf-cortexa65x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-1x2t,fvp-8_2-1x2t:fvp-neoverse_e1x1-tftf-fip.tftf-neoverse_e1x1-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-1x2t,fvp-8_2-1x2t:fvp-neoverse_e1x1-tftf-fip.tftf-neoverse_e1x1-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-1x2t,fvp-8_2-1x2t:fvp-neoverse_e1x1-tftf-fip.tftf-neoverse_e1x1-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-2x2t,fvp-8_2-2x2t:fvp-neoverse_e1x2-tftf-fip.tftf-neoverse_e1x2-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-2x2t,fvp-8_2-2x2t:fvp-neoverse_e1x2-tftf-fip.tftf-neoverse_e1x2-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-2x2t,fvp-8_2-2x2t:fvp-neoverse_e1x2-tftf-fip.tftf-neoverse_e1x2-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-4x2t,fvp-8_2-4x2t:fvp-neoverse_e1x4-tftf-fip.tftf-neoverse_e1x4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-4x2t,fvp-8_2-4x2t:fvp-neoverse_e1x4-tftf-fip.tftf-neoverse_e1x4-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8_2-4x2t,fvp-8_2-4x2t:fvp-neoverse_e1x4-tftf-fip.tftf-neoverse_e1x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8x2t,fvp-8x2t:fvp-dtb.dyn.2t-tftf-fip.tftf-cortexa65aex8-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8x2t,fvp-8x2t:fvp-dtb.dyn.2t-tftf-fip.tftf-cortexa65aex8-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only-8x2t,fvp-8x2t:fvp-dtb.dyn.2t-tftf-fip.tftf-cortexa65aex8-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.8_3-debug b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.8_3-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.8_3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-xlat-v2:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-xlat-v2:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-xlat-v2:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.8_3-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.8_3-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.8_3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch64-sdei,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp/fvp-aarch64-sdei,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch64-sdei,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch64-sdei,fvp-default:fvp-tftf-fip.tftf-aemva-debug b/group/tftf-l2-fvp/fvp-aarch64-sdei,fvp-default:fvp-tftf-fip.tftf-aemva-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch64-sdei,fvp-default:fvp-tftf-fip.tftf-aemva-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-debugfs,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp/fvp-debugfs,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-debugfs,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve-debug b/group/tftf-l2-fvp/fvp-default,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, 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-aemv8a-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, 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-aemv8a.amu-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, 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-aemv8a.singlecore-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, 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-aemva-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemva-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, 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-cortexa35x4-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, 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-cortexa57x4a53x4-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, 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-default,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-xlat-v2:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp/fvp-default,fvp-xlat-v2:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-xlat-v2:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-gicv4,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv4 b/group/tftf-l2-fvp/fvp-gicv4,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv4
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-gicv4,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv4
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-pl33,fvp-default:fvp-tftf-aemv8a.pl33-debug b/group/tftf-l2-fvp/fvp-pl33,fvp-default:fvp-tftf-aemv8a.pl33-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-pl33,fvp-default:fvp-tftf-aemv8a.pl33-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd-debug b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd-debug b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd-debug b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemva-tspd-debug b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemva-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-aemva-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-tspd-debug b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa35x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd-debug b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
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,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-tspd,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fwu/fvp-aarch32-tbb-mbedtls,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot b/group/tftf-l2-fwu/fvp-aarch32-tbb-mbedtls,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fwu/fvp-aarch32-tbb-mbedtls,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fwu/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot b/group/tftf-l2-fwu/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tftf-l2-fwu/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls,fvp-fwu:fvp-tftf.fwu-aemv8a b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls,fvp-fwu:fvp-tftf.fwu-aemv8a
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls,fvp-fwu:fvp-tftf.fwu-aemv8a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls,fvp-fwu:fvp-tftf.fwu-aemva b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls,fvp-fwu:fvp-tftf.fwu-aemva
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls,fvp-fwu:fvp-tftf.fwu-aemva
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-ecdsa-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-ecdsa-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-ecdsa-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-pauth,fvp-fwu-pauth:fvp-tftf.fwu-aemv8a.8_5 b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-pauth,fvp-fwu-pauth:fvp-tftf.fwu-aemv8a.8_5
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-pauth,fvp-fwu-pauth:fvp-tftf.fwu-aemv8a.8_5
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fwu/juno-tspd-tbb-mbedtls,juno-fwu:juno-tftf.fwu-debug b/group/tftf-l2-fwu/juno-tspd-tbb-mbedtls,juno-fwu:juno-tftf.fwu-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tftf-l2-fwu/juno-tspd-tbb-mbedtls,juno-fwu:juno-tftf.fwu-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tftf-l2-juno/juno-default-armclang,juno-default:juno-tftf b/group/tftf-l2-juno/juno-default-armclang,juno-default:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-juno/juno-default-armclang,juno-default:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-juno/juno-default-clang,juno-default:juno-tftf b/group/tftf-l2-juno/juno-default-clang,juno-default:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-juno/juno-default-clang,juno-default:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-juno/juno-tsp-no-cohmem-irq2el3,juno-default:juno-tftf b/group/tftf-l2-juno/juno-tsp-no-cohmem-irq2el3,juno-default:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-juno/juno-tsp-no-cohmem-irq2el3,juno-default:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-r1 b/group/tftf-l2-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-r1
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-r1
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-r2 b/group/tftf-l2-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-r2
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-r2
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-reboot/fvp-aarch32-default,fvp-aarch32-NVM_reboot:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.NVM_reboot b/group/tftf-l2-reboot/fvp-aarch32-default,fvp-aarch32-NVM_reboot:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.NVM_reboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-reboot/fvp-aarch32-default,fvp-aarch32-NVM_reboot:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.NVM_reboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-reboot/fvp-default,fvp-NVM_reboot:fvp-tftf-fip.tftf-aemv8a.NVM_reboot b/group/tftf-l2-reboot/fvp-default,fvp-NVM_reboot:fvp-tftf-fip.tftf-aemv8a.NVM_reboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-l2-reboot/fvp-default,fvp-NVM_reboot:fvp-tftf-fip.tftf-aemv8a.NVM_reboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-reboot_reset2-juno/juno-aarch32-el3-runtime,juno-aarch32-reboot_reset2:juno-tftf+aarch32.reboot-rt32 b/group/tftf-reboot_reset2-juno/juno-aarch32-el3-runtime,juno-aarch32-reboot_reset2:juno-tftf+aarch32.reboot-rt32
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-reboot_reset2-juno/juno-aarch32-el3-runtime,juno-aarch32-reboot_reset2:juno-tftf+aarch32.reboot-rt32
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-reboot_reset2-juno/juno-default,juno-reboot_reset2:juno-tftf.reboot b/group/tftf-reboot_reset2-juno/juno-default,juno-reboot_reset2:juno-tftf.reboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-reboot_reset2-juno/juno-default,juno-reboot_reset2:juno-tftf.reboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a b/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a.assymetric b/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a.assymetric
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a.assymetric
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a.singlecore b/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a.singlecore
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-aemv8a.singlecore
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-foundationv8 b/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-unstable/fvp-default,fvp-unstable:fvp-tftf-fip.tftf-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-unstable/juno-default,juno-unstable:juno-tftf b/group/tftf-unstable/juno-default,juno-unstable:juno-tftf
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tftf-unstable/juno-default,juno-unstable:juno-tftf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi-aemv8a_revb.latest b/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi-aemv8a_revb.latest
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi-aemv8a_revb.latest
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi.debug-aemv8a_revb.latest-debug b/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi.debug-aemv8a_revb.latest-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi.debug-aemv8a_revb.latest-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+