code coverage: remove configs from weekly
Removing problematic configs from weekly run.
This would include foundation and non debug runs.
Change-Id: I47af4d45d908de79819c594860e09bcdcda2b8fe
Signed-off-by: mardyk01 <mark.dykes@arm.com>
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch32-default-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32.etm_trace_ext.bmcov b/group/tf-l3-code-coverage-extensive/fvp-aarch32-default-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32.etm_trace_ext.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch32-default-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemva.aarch32.etm_trace_ext.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch32-roxlattables-cc,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_panic.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-aarch32-roxlattables-cc,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_panic.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch32-roxlattables-cc,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_panic.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov b/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-dualroot-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.bmcov b/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-dualroot-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-dualroot-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-dualroot-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov b/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-dualroot-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-dualroot-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-rsa-3k-cert-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov b/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-rsa-3k-cert-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch32-tbb-mbedtls-rsa-3k-cert-cc,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov b/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-extensive:fvp-tftf-fip.tftf-foundationv8.bmcov b/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-extensive:fvp-tftf-fip.tftf-foundationv8.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch64-only-cc,fvp-extensive:fvp-tftf-fip.tftf-foundationv8.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch64-roxlattables-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-aarch64-roxlattables-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch64-roxlattables-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-aarch64-roxlattables-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_panic.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-aarch64-roxlattables-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_panic.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-aarch64-roxlattables-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_panic.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-bl31-separate-nobits-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-bl31-separate-nobits-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-bl31-separate-nobits-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-crash-report-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.runtime_bl31_main_panic.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-crash-report-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.runtime_bl31_main_panic.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-crash-report-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.runtime_bl31_main_panic.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_7.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_7.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_7.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-clang-bfd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-clang-bfd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-clang-bfd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-clang-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-default-clang-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-default-clang-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-detect-features-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.arch_features.bmcov b/group/tf-l3-code-coverage-extensive/fvp-detect-features-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.arch_features.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-detect-features-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.arch_features.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-enable-runtime-instr-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-enable-runtime-instr-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-enable-runtime-instr-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-ext-pstate-ea-el3-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-ext-pstate-ea-el3-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-ext-pstate-ea-el3-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-gicv4-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-gicv4-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-gicv4-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-hcx-aarch64-only-cc,fvp-hcx:fvp-tftf-fip.tftf-foundationv8.bmcov b/group/tf-l3-code-coverage-extensive/fvp-hcx-aarch64-only-cc,fvp-hcx:fvp-tftf-fip.tftf-foundationv8.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-hcx-aarch64-only-cc,fvp-hcx:fvp-tftf-fip.tftf-foundationv8.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-mb_hash256-tbb_hash256-romlib,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-mb_hash256-tbb_hash256-romlib,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
deleted file mode 100644
index c473896..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-mb_hash256-tbb_hash256-romlib,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l3-code-coverage-extensive/fvp-mtpmu-disable-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-mtpmu-disable-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-mtpmu-disable-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-brbe-regs-access-cc,fvp-default:fvp-tftf-fip.tftf-aemva.feat_brbe.bl31_panic.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-no-brbe-regs-access-cc,fvp-default:fvp-tftf-fip.tftf-aemva.feat_brbe.bl31_panic.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-brbe-regs-access-cc,fvp-default:fvp-tftf-fip.tftf-aemva.feat_brbe.bl31_panic.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov b/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov b/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov b/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov b/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-cohmem-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-sys-regs-trace-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-no-sys-regs-trace-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-sys-regs-trace-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-trbe-regs-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-no-trbe-regs-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-trbe-regs-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-no-trf-regs-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-no-trf-regs-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-no-trf-regs-access-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext.bl31_panic.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-opteed-aarch64-only-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8.bmcov b/group/tf-l3-code-coverage-extensive/fvp-opteed-aarch64-only-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-opteed-aarch64-only-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-foundationv8.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.assymetric.bmcov b/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.assymetric.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.assymetric.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.singlecore.bmcov b/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.singlecore.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemv8a.singlecore.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemva.bmcov b/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemva.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-aemva.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa35x4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa35x4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa35x4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa57x4a53x4.bmcov b/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa57x4a53x4.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-opteed-cc,fvp-default:fvp-tftf-optee-fip.tftf+bl32-cortexa57x4a53x4.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-romlib-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov b/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-romlib-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-romlib-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-tsp-romlib-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov b/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-tsp-romlib-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-tsp-romlib-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-tsp-sdei-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-tsp-sdei-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-pauth-bti-tsp-sdei-cc,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-pauth-pac-ret-tsp-sdei-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-pauth-pac-ret-tsp-sdei-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-pauth-pac-ret-tsp-sdei-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-romlib-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov b/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-romlib-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-romlib-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-tsp-romlib-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov b/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-tsp-romlib-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-tsp-romlib-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-tsp-sdei-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-tsp-sdei-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-pauth-standard-tsp-sdei-cc,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-ras-ffh-cc,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-ras-ffh-cc,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi.bmcov-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-ras-ffh-cc,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi.bmcov-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd-debug b/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-default:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-extensive:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-extensive:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-aarch64-only-cc,fvp-extensive:fvp-tftf-fip.tftf-foundationv8.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-aemva.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-cortexa35x4.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-default:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.assymetric.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemv8a.singlecore.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemva.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemva.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-aemva.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa35x4.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov-tspd b/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov-tspd
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-cc,fvp-extensive:fvp-tftf-fip.tftf-cortexa57x4a53x4.bmcov-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-quad-cluster-cc,fvp-4x4:fvp-tftf-fip.tftf-aemv8a.quad.bmcov-tspd-debug b/group/tf-l3-code-coverage-extensive/fvp-tspd-quad-cluster-cc,fvp-4x4:fvp-tftf-fip.tftf-aemv8a.quad.bmcov-tspd-debug
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-quad-cluster-cc,fvp-4x4:fvp-tftf-fip.tftf-aemv8a.quad.bmcov-tspd-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemva.bmcov b/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemva.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemva.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-dualroot-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-dualroot-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-dualroot-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-dualroot-cc,fvp-fwu:fvp-tftf.fwu.mbedtls2-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-dualroot-cc,fvp-fwu:fvp-tftf.fwu.mbedtls2-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-dualroot-cc,fvp-fwu:fvp-tftf.fwu.mbedtls2-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-ecdsa-dualroot-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-ecdsa-dualroot-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-ecdsa-dualroot-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-pauth-cc,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5+bti.bmcov b/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-pauth-cc,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5+bti.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-pauth-cc,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5+bti.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-rsa-4k-cert-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov b/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-rsa-4k-cert-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l3-code-coverage-extensive/fvp-tspd-tbb-mbedtls-rsa-4k-cert-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#