ci: update errata and abi tests
- Merge errata all tests with ABI tests.
- Add additional cortex-X4 and cortex-X925 FVP based tests for errata
all and ABI tests.
Change-Id: Ifbce887dd400485699da72dc0a28c2ea151900d0
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/group/tf-l1-build-fvp/fvp-errata-abi:nil b/group/tf-l1-build-fvp/fvp-errata-abi:nil
deleted file mode 100644
index b452bbf..0000000
--- a/group/tf-l1-build-fvp/fvp-errata-abi:nil
+++ /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-l1-build-fvp/fvp-errata-all:nil b/group/tf-l1-build-fvp/fvp-errata-all-abi:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-errata-all:nil
rename to group/tf-l1-build-fvp/fvp-errata-all-abi:nil
diff --git a/group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x8-debug b/group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x8-debug
deleted file mode 100644
index b5a3cc6..0000000
--- a/group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x8-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2024 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexa710x8-debug b/group/tftf-l2-fvp/fvp-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexa710x8-debug
new file mode 100644
index 0000000..8e2a912
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexa710x8-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025 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-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexx4-debug b/group/tftf-l2-fvp/fvp-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexx4-debug
new file mode 100644
index 0000000..8e2a912
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexx4-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025 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-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexx925-debug b/group/tftf-l2-fvp/fvp-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexx925-debug
new file mode 100644
index 0000000..8e2a912
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-errata-all-abi,fvp-default:fvp-tftf-fip.tftf-cortexx925-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/tf_config/fvp-errata-abi-a710 b/tf_config/fvp-errata-abi-a710
deleted file mode 100644
index 45b87e3..0000000
--- a/tf_config/fvp-errata-abi-a710
+++ /dev/null
@@ -1,26 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-CTX_INCLUDE_AARCH32_REGS=0
-FVP_TRUSTED_SRAM_SIZE=384
-ERRATA_A710_1987031=1
-ERRATA_A710_2008768=1
-ERRATA_A710_2017096=1
-ERRATA_A710_2055002=1
-ERRATA_A710_2058056=1
-ERRATA_A710_2081180=1
-ERRATA_A710_2083908=1
-ERRATA_A710_2136059=1
-ERRATA_A710_2147715=1
-ERRATA_A710_2216384=1
-ERRATA_A710_2267065=1
-ERRATA_A710_2282622=1
-ERRATA_A710_2291219=1
-ERRATA_A710_2371105=1
-ERRATA_A710_2701952=1
-ERRATA_A710_2742423=1
-ERRATA_A710_2768515=1
-ERRATA_A710_2778471=1
-ERRATA_ABI_SUPPORT=1
-ERRATA_NON_ARM_INTERCONNECT=1
-HW_ASSISTED_COHERENCY=1
-PLAT=fvp
-USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-errata-all b/tf_config/fvp-errata-all-abi
similarity index 87%
rename from tf_config/fvp-errata-all
rename to tf_config/fvp-errata-all-abi
index fcfea37..6f6f307 100644
--- a/tf_config/fvp-errata-all
+++ b/tf_config/fvp-errata-all-abi
@@ -1,6 +1,7 @@
CROSS_COMPILE=aarch64-none-elf-
CTX_INCLUDE_AARCH32_REGS=0
ENABLE_ERRATA_ALL=1
+ERRATA_ABI_SUPPORT=1
FVP_TRUSTED_SRAM_SIZE=384
HW_ASSISTED_COHERENCY=1
PLAT=fvp