chore(2.7): update CSS models and run configs
Update CSS-related models version to 11.17/33 as per currently
recommended RD/SGI FVP version for the release tag RD-INFRA-2022.03.31.
Signed-off-by: Maksims Svecovs <maksims.svecovs@arm.com>
Change-Id: I4773419d1c994a54130ba2460e314898adad234c
diff --git a/model/css-rde1edge.sh b/model/css-rde1edge.sh
index c0bde09..fe5e815 100644
--- a/model/css-rde1edge.sh
+++ b/model/css-rde1edge.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_E1_edge"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_RD_E1_edge"
cat <<EOF >"$model_param_file"
-C board.flashloader0.fname=$fip_bin
diff --git a/model/css-rdn1edge.sh b/model/css-rdn1edge.sh
index c9084c0..262b7d2 100644
--- a/model/css-rdn1edge.sh
+++ b/model/css-rdn1edge.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_N1_edge"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_RD_N1_edge"
cat <<EOF >"$model_param_file"
-C board.flashloader0.fname=$fip_bin
diff --git a/model/css-rdn1edgex2.sh b/model/css-rdn1edgex2.sh
index 86a7e69..d0203ab 100644
--- a/model/css-rdn1edgex2.sh
+++ b/model/css-rdn1edgex2.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_N1_edge_dual"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_RD_N1_edge_dual"
cat <<EOF >"$model_param_file"
diff --git a/model/css-rdv1.sh b/model/css-rdv1.sh
index bc807eb..2a6b991 100644
--- a/model/css-rdv1.sh
+++ b/model/css-rdv1.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_V1"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_RD_V1"
cat <<EOF >"$model_param_file"
-C board.flashloader0.fname=$fip_bin
diff --git a/model/css-sgi575.sh b/model/css-sgi575.sh
index 873baba..137ef51 100644
--- a/model/css-sgi575.sh
+++ b/model/css-sgi575.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_CSS_SGI-575"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_CSS_SGI-575"
cat <<EOF >"$model_param_file"
-C board.flashloader0.fname=$fip_bin
diff --git a/run_config/fvp-rde1edge b/run_config/fvp-rde1edge
index 40c0c57..9cb8f34 100644
--- a/run_config/fvp-rde1edge
+++ b/run_config/fvp-rde1edge
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -20,8 +20,6 @@
local model="css-rde1edge"
model="css-rde1edge" \
- model_version="11.9" \
- model_build="41" \
gen_model_params
set_run_env "ports_script" "$ci_root/model/css-sgi575-ports.awk"
set_run_env "num_uarts" "2"