chore(2.8): update FVP version for 2.8 release
Updates common FVP model version from 11.17/21 to 11.19/14.
Moves FVP_Base_AEMvA ETE and FVP_Base_RevC-2xAEMvA to common FVP
model version.
Keeps FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502 and
FVP_Base_AEMv8A-GIC600AE as 11.17/21 versions as they do not
exist for 11.19/14. Also keeping FVP_Base_Cortex-A710x4 and
FVP_Base_Cortex-X2x4 to version 11.17/21.
Updates data instance for cortex-a55x4-a76x2 and
cortex-a55x4-a75x4.
Update FVP models array and add R-class FVP support to OpenCI.
Signed-off-by: Lauren Wehrmeister <lauren.wehrmeister@arm.com>
Change-Id: I502ffa8798866d69e5613ea89ae068b2b01c2d78
diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index f9ce3a8..19a06a3 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -26,6 +26,7 @@
reset_var secure_memory
reset_var secure_ram_fill
reset_var wait_debugger
+reset_var cluster_0_num_cores
if [ "$bl2_at_el3" ]; then
@@ -52,6 +53,8 @@
${bl2_at_el3+--data ${data_instance}=$bl2_bin@${bl2_addr:?}}
+${cluster_0_num_cores+-C cluster0.NUM_CORES=$cluster_0_num_cores}
+
${reset_to_bl31+--data ${data_instance}=$bl31_bin@${bl31_addr:?}}
${preload_bl33+--data ${data_instance}=$preload_bl33_bin@${bl33_addr:?}}