fvp: migrate FVP to 11.28.23 release
Migrate FVP models in CI To 11.28.23. The following done part
of migration efforts.
- Move std, revc, base, rd_1_ae, tc4 FVP's to use latest FVP's.
- Some FVP's have removed x4 in the file names, so modify
them to have NUM_CORES=4 model param. But retain the config names
with x4 indicating they are used as quad core configuration.
- Remove FVP Cortex-A72x4-A53x4 test and model usage, this model
is been deprecated in 11.28.23 release, But we do have
Cortex-A73x4-A53x4 and in use in CI so we are not missing out
any coverage from heterogeneous Big.Little combination.
Change-Id: Id50a01a050a0f04eb8c4f314ce3d17a247a76e7c
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/model/cortex-a32x4.sh b/model/cortex-a32x4.sh
index 31df685..a66e9d2 100644
--- a/model/cortex-a32x4.sh
+++ b/model/cortex-a32x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2024 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A32x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A32"
source "$ci_root/model/fvp_common.sh"
@@ -15,4 +15,6 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
EOF
diff --git a/model/cortex-a35x4.sh b/model/cortex-a35x4.sh
index 1816ce0..642de7b 100644
--- a/model/cortex-a35x4.sh
+++ b/model/cortex-a35x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
+# Copyright (c) 2023-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A35x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A35"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${bmcov_plugin+--plugin=$bmcov_plugin_path}
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
diff --git a/model/cortex-a53x4.sh b/model/cortex-a53x4.sh
index 7d38d96..1b9d729 100644
--- a/model/cortex-a53x4.sh
+++ b/model/cortex-a53x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A53x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A53"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu1.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu2.RVBARADDR=${bl32_addr:?}}
diff --git a/model/cortex-a57x4.sh b/model/cortex-a57x4.sh
index c740dff..1f0b085 100644
--- a/model/cortex-a57x4.sh
+++ b/model/cortex-a57x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A57x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A57"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu1.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu2.RVBARADDR=${bl32_addr:?}}
diff --git a/model/cortex-a65aex8.sh b/model/cortex-a65aex8.sh
index babd4c9..24c9269 100644
--- a/model/cortex-a65aex8.sh
+++ b/model/cortex-a65aex8.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2024, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Cortex-A65AE"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65AE"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a65x4.sh b/model/cortex-a65x4.sh
index 5f24cd1..fd97c3a 100644
--- a/model/cortex-a65x4.sh
+++ b/model/cortex-a65x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "/$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Cortex-A65"
+set_model_path "/$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a72x4.sh b/model/cortex-a72x4.sh
index 0db883e..663d10d 100644
--- a/model/cortex-a72x4.sh
+++ b/model/cortex-a72x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A72x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A72"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu1.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu2.RVBARADDR=${bl32_addr:?}}
diff --git a/model/cortex-a73x4.sh b/model/cortex-a73x4.sh
index be61565..bdbce81 100644
--- a/model/cortex-a73x4.sh
+++ b/model/cortex-a73x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A73x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A73"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu1.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu2.RVBARADDR=${bl32_addr:?}}
diff --git a/model/neoverse_e1.sh b/model/neoverse_e1.sh
index c1858d8..7411986 100644
--- a/model/neoverse_e1.sh
+++ b/model/neoverse_e1.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/tc4.sh b/model/tc4.sh
index e9c7c56..25f03a6 100644
--- a/model/tc4.sh
+++ b/model/tc4.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2022-2024, Arm Limited. All rights reserved.
+# Copyright (c) 2022-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/SubSystemModels/0.0/8404/models/$model_flavour/FVP_TC4"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC4"
cat <<EOF >"$model_param_file"
${fip_gpt_bin+-C board.flashloader0.fname=$fip_gpt_bin}
-C board.pl011_uart2.unbuffered_output=1