Sync test groups with internal CI
Signed-off-by: Zelalem <zelalem.aweke@arm.com>
Change-Id: I8bf270aaee4607c97b2706dd87328e8566be0261
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
+#
+