FVP: Update FVP model version to 11.15.14
Updated FVP model version to 11.15.14 as per latest release.
Also, renamed matterhornx4 FVP model name to cortex-a710.
Change-Id: I597a144dbba5a32aaad64b2a6cdfc7a685456286
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index b2ad052..fb9cc2d 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -86,7 +86,7 @@
[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1x4"
[neoverse_n2]=";;;"
[neoverse-v1x4]=";;;"
-[matterhornx4]=";;;"
+[cortexa710x4]=";;;"
[css-rdv1]=";;;"
[css-rde1edge]=";;;"
[css-rdn1edge]=";;;"
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-matterhornx4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa710x4-debug
similarity index 100%
rename from group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-matterhornx4-debug
rename to group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa710x4-debug
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-matterhornx4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug
similarity index 100%
rename from group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-matterhornx4-debug
rename to group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug
diff --git a/model/matterhornx4.sh b/model/cortex-a710.sh
similarity index 78%
rename from model/matterhornx4.sh
rename to model/cortex-a710.sh
index 9571c73..29d5978 100644
--- a/model/matterhornx4.sh
+++ b/model/cortex-a710.sh
@@ -5,6 +5,6 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Matterhornx4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A710x4"
source "$ci_root/model/fvp_common.sh"
diff --git a/run_config/fvp-matterhornx4 b/run_config/fvp-cortexa710x4
similarity index 88%
rename from run_config/fvp-matterhornx4
rename to run_config/fvp-cortexa710x4
index 1e58454..5119c94 100644
--- a/run_config/fvp-matterhornx4
+++ b/run_config/fvp-cortexa710x4
@@ -6,7 +6,7 @@
#
post_fetch_tf_resource() {
- local model="matterhornx4"
+ local model="cortex-a710"
model="$model" \
cache_state_modelled="0" \
diff --git a/utils.sh b/utils.sh
index 20bb10d..8c7170b 100644
--- a/utils.sh
+++ b/utils.sh
@@ -306,8 +306,8 @@
model_flavour_11_12="Linux64_GCC-6.4"
# Model revisions
-model_version="${model_version:-11.14}"
-model_build="${model_build:-21}"
+model_version="${model_version:-11.15}"
+model_build="${model_build:-14}"
model_flavour="${model_flavour:-Linux64_GCC-6.4}"
# Model snapshots from filer are not normally not accessible from developer