refactor(fvp): remove certain tests
Certain Model configurations are not available
from FVP 11.26 remove those test configurations.
- FVP_Base_Cortex-A55x4+Cortex-A75x4
- FVP_Base_Cortex-A55x4+Cortex-A76x2
Remove those test configurations.
Change-Id: I7d15a17edca85907261e1f32055a23ba891016e0
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 6c2a074..2685c38 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -75,8 +75,6 @@
[cortex-a35x4]="${fvp_arm_std_library};FVP_Base_Cortex-A35x4"
[cortex-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A53x4"
[cortex-a55x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55"
-[cortex-a55x4-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A75x4"
-[cortex-a55x4-a76x2]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A76x2"
[cortex-a57x1-a53x1]="${fvp_arm_std_library};FVP_Base_Cortex-A57x1-A53x1"
[cortex-a57x2-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x2-A53x4"
[cortex-a57x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4"
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
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a76x2-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/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
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a75x4-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-1x8:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-1x8:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq,fvp-1x8:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-1x8:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a76x2-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-1x8:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a76x2-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-1x8:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a76x2-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-errata-abi-a55,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug b/group/tftf-l2-fvp/fvp-errata-abi-a55,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug
deleted file mode 100644
index 5515958..0000000
--- a/group/tftf-l2-fvp/fvp-errata-abi-a55,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/model/cortex-a55x4-a75x4.sh b/model/cortex-a55x4-a75x4.sh
deleted file mode 100644
index 3d68bea..0000000
--- a/model/cortex-a55x4-a75x4.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A55x4+Cortex-A75x4"
-
-source "$ci_root/model/fvp_common.sh"
-
-cat <<EOF >>"${model_param_file}"
--C bp.terminal_0.start_port=5000
--C bp.terminal_1.start_port=5001
--C bp.terminal_2.start_port=5002
--C bp.terminal_3.start_port=5003
-EOF
diff --git a/model/cortex-a55x4-a76x2.sh b/model/cortex-a55x4-a76x2.sh
deleted file mode 100644
index f57f935..0000000
--- a/model/cortex-a55x4-a76x2.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A55x4+Cortex-A76x2"
-
-source "$ci_root/model/fvp_common.sh"
-
-cat <<EOF >>"${model_param_file}"
--C bp.terminal_0.start_port=5000
--C bp.terminal_1.start_port=5001
--C bp.terminal_2.start_port=5002
--C bp.terminal_3.start_port=5003
-EOF