FVP: Revert FVP version for select models
Signed-off-by: Lauren Wehrmeister <lauren.wehrmeister@arm.com>
Change-Id: I7303f8b45b9ad6559995d2174d3b2cf9347043d4
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 0040032..5a3c8ad 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -40,6 +40,7 @@
default_model_dtb="fvp-base-gicv3-psci.dtb"
# FVP containers and model paths
+fvp_arm_std_library_11_12="fvp:fvp_arm_std_library_${model_version_11_12}_${model_build_11_12};/opt/model/FVP_ARM_Std_Library/models/${model_flavour_11_12}"
fvp_arm_std_library="fvp:fvp_arm_std_library_${model_version}_${model_build};/opt/model/FVP_ARM_Std_Library/models/${model_flavour}"
fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build};/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
foundation_platform="fvp:foundation_platform_${model_version}_${model_build};/opt/model/Foundation_Platformpkg/models/${model_flavour}"
@@ -57,7 +58,7 @@
[base-aemv8a-gic600ae]=";;;"
[foundationv8]="${foundation_platform};Foundation_Platform"
[base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
-[cortex-a32x4]="${fvp_arm_std_library};FVP_Base_Cortex-A32x4"
+[cortex-a32x4]="${fvp_arm_std_library_11_12};FVP_Base_Cortex-A32x4"
[cortex-a35x4]="${fvp_arm_std_library};FVP_Base_Cortex-A35x4"
[cortex-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A53x4"
[cortex-a55x4-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A75x4"
diff --git a/model/cortex-a32x4.sh b/model/cortex-a32x4.sh
index abb733c..1d459c9 100644
--- a/model/cortex-a32x4.sh
+++ b/model/cortex-a32x4.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-A32x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A32x4"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/neoverse_n2.sh b/model/neoverse_n2.sh
index 1c3504d..67cc259 100644
--- a/model/neoverse_n2.sh
+++ b/model/neoverse_n2.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_Neoverse-N2x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-N2x4"
source "$ci_root/model/fvp_common.sh"
diff --git a/run_config/fvp-cortexa32x4 b/run_config/fvp-cortexa32x4
index e80aac1..13abfef 100644
--- a/run_config/fvp-cortexa32x4
+++ b/run_config/fvp-cortexa32x4
@@ -8,7 +8,10 @@
post_fetch_tf_resource() {
local model="cortex-a32x4"
- model="$model" gen_model_params
+ model="$model" \
+ model_version="11.12" \
+ model_build="38" \
+ gen_model_params
uart="0" set_expect_variable "num_cpus" "4"
model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-cortexa32x4.rstspmin b/run_config/fvp-cortexa32x4.rstspmin
index 6ffbdb5..0e973c5 100644
--- a/run_config/fvp-cortexa32x4.rstspmin
+++ b/run_config/fvp-cortexa32x4.rstspmin
@@ -8,7 +8,11 @@
post_fetch_tf_resource() {
local model="cortex-a32x4"
- reset_to_spmin="1" model="$model" gen_model_params
+ reset_to_spmin="1" \
+ model="$model" \
+ model_version="11.12" \
+ model_build="38" \
+ gen_model_params
uart="0" set_expect_variable "num_cpus" "4"
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-neoverse_n2x4 b/run_config/fvp-neoverse_n2x4
index de33786..ffdeaa0 100644
--- a/run_config/fvp-neoverse_n2x4
+++ b/run_config/fvp-neoverse_n2x4
@@ -9,6 +9,8 @@
local model="neoverse_n2"
model="$model" \
+ model_version="11.12" \
+ model_build="38" \
cache_state_modelled="0" \
gen_model_params
uart="0" set_expect_variable "num_cpus" "4"
diff --git a/utils.sh b/utils.sh
index c42fb6d..24b9f67 100644
--- a/utils.sh
+++ b/utils.sh
@@ -300,6 +300,11 @@
jenkins_url="${JENKINS_URL%/*}"
jenkins_url="${jenkins_url:-https://ci.trustedfirmware.org/}"
+# 11.12 Model revisions
+model_version_11_12="11.12"
+model_build_11_12="38"
+model_flavour_11_12="Linux64_GCC-6.4"
+
# Model revisions
model_version="${model_version:-11.14}"
model_build="${model_build:-21}"