chore: use FVP_Base_Cortex-A710 over FVP_Base_Cortex-A710x4
The FVP_Base_Cortex-A710x4 FVP is no longer distributed, but the
FVP_Base_Cortex-A710 suffices for all of the tests that we need the
quad-core configuration for.
Change-Id: I4249d47785845191108503fab6dfca67b7239843
Signed-off-by: Chris Kay <chris.kay@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 03921f5..ff7025e 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -102,7 +102,7 @@
[cortex-a78aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A78AE"
[cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
[cortex-x2]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-X2x4"
-[cortex-a710]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-A710x4"
+[cortex-a710]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
[neoverse_e1x1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
[neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
[neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
diff --git a/model/cortex-a710.sh b/model/cortex-a710.sh
index b70814b..a4a0d0a 100644
--- a/model/cortex-a710.sh
+++ b/model/cortex-a710.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_Cortex-A710x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A710"
source "$ci_root/model/fvp_common.sh"
diff --git a/run_config/fvp-cortexa710x4 b/run_config/fvp-cortexa710x4
index 1eea3e8..f11c6bc 100644
--- a/run_config/fvp-cortexa710x4
+++ b/run_config/fvp-cortexa710x4
@@ -10,6 +10,7 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" cache_state_modelled="0" cluster_0_num_cores="4" \
+ gen_model_params
model="$model" gen_fvp_yaml
}