Revert "chore: use FVP_Base_Cortex-A710 over FVP_Base_Cortex-A710x4"
This reverts commit 4a185bb54f98ceb0ff6173850770a2e0ad917898.
Reason for revert: The A710 model is still awaiting changes to TF-A to deal with how power transitions must now be handled.
Change-Id: Ibdcfe1ed31a7d719f492a4a3e77993d2f746d0ea
diff --git a/fvp_utils.sh b/fvp_utils.sh
index ff7025e..03921f5 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};FVP_Base_Cortex-A710"
+[cortex-a710]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-A710x4"
[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 a4a0d0a..b70814b 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/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A710"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_Cortex-A710x4"
source "$ci_root/model/fvp_common.sh"
diff --git a/run_config/fvp-cortexa710x4 b/run_config/fvp-cortexa710x4
index f11c6bc..1eea3e8 100644
--- a/run_config/fvp-cortexa710x4
+++ b/run_config/fvp-cortexa710x4
@@ -10,7 +10,6 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" cluster_0_num_cores="4" \
- gen_model_params
+ model="$model" cache_state_modelled="0" gen_model_params
model="$model" gen_fvp_yaml
}