commit d10c1b91cbfc2f2bfd35e994dd2a502a269a63c3
author Maksims Svecovs <maksims.svecovs@arm.com> Wed Oct 06 10:25:40 2021 +0100
committer Maksims Svecovs <maksims.svecovs@arm.com> Mon Oct 25 11:33:33 2021 +0100
tree 0a2360fa6efa28842acf2e9a1fa4f606f52ea480
parent af99c862f0391bf88c85d6ae4d8fc2f7de88ca3a

chore(2.6): update FVP version for v2.6 release

Updates common FVP model version from 11.15/14 to 11.16/16
Updates Morello FVP model version from 0.10/542 to 0.11/19
Updates total compute model version to 11.16/16

Signed-off-by: Maksims Svecovs <maksims.svecovs@arm.com>
Change-Id: I8f8d4a622fb01f0b1dbf43c5140803a2b87be037

model/cortex-a32x4.sh

diff --git a/model/cortex-a32x4.sh b/model/cortex-a32x4.sh
index 1d459c9..5483c6a 100644
--- a/model/cortex-a32x4.sh
+++ b/model/cortex-a32x4.sh
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# model_version, model_build set in post_fetch_tf_resource
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A32x4"
 
 source "$ci_root/model/fvp_common.sh"

model/morello.sh

diff --git a/model/morello.sh b/model/morello.sh
index cc78c9c..92e05a6 100644
--- a/model/morello.sh
+++ b/model/morello.sh
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# model_version, model_build set in post_fetch_tf_resource
 set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_Morello"
 
 cat <<EOF >"$model_param_file"

model/neoverse_n2.sh

diff --git a/model/neoverse_n2.sh b/model/neoverse_n2.sh
index 67cc259..7a9f380 100644
--- a/model/neoverse_n2.sh
+++ b/model/neoverse_n2.sh
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# model_version, model_build set in post_fetch_tf_resource
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-N2x4"
 
 source "$ci_root/model/fvp_common.sh"

model/tc0.sh

diff --git a/model/tc0.sh b/model/tc0.sh
index bc72115..1f0ae7c 100644
--- a/model/tc0.sh
+++ b/model/tc0.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/0.0/6509/models/$model_flavour/FVP_TC0"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC0"
 
 cat <<EOF >"$model_param_file"
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}

model/tc1.sh

diff --git a/model/tc1.sh b/model/tc1.sh
index e3deb8c..dc184de 100644
--- a/model/tc1.sh
+++ b/model/tc1.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/20/models/$model_flavour/FVP_TC1"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC1"
 
 cat <<EOF >"$model_param_file"
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}