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/fvp_utils.sh b/fvp_utils.sh
index 8ee9a7f..5825712 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -42,8 +42,13 @@
# 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_11_16="fvp:fvp_arm_std_library_${model_version_11_16}_${model_build_11_16};/opt/model/FVP_ARM_Std_Library/FVP_Base"
+fvp_arm_std_library_11_17="fvp:fvp_arm_std_library_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_ARM_Std_Library/FVP_Base"
fvp_arm_std_library="fvp:fvp_arm_std_library_${model_version}_${model_build};/opt/model/FVP_ARM_Std_Library/FVP_Base"
+fvp_base_aemva="fvp:fvp_base_aemva_${model_version}_${model_build};/opt/model/FVP_Base_AEMvA/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}"
+fvp_base_aemv8a_gic600ae="fvp:fvp_base_aemv8a-gic600ae_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-GIC600AE_pkg/models/${model_flavour_11_17}"
+fvp_base_aemv8a_aemv8a_aemv8a_aemv8a_ccn502="fvp:fvp_base_aemv8a-aemv8a-aemv8a-aemv8a-ccn502_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502_pkg/models/${model_flavour_11_17}"
foundation_platform="fvp:foundation_platform_${model_version}_${model_build};/opt/model/Foundation_Platformpkg/models/${model_flavour}"
fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
@@ -54,43 +59,43 @@
declare -A fvp_models
fvp_models=(
[base-aemv8a-quad]=";;;"
-[base-aemv8a-revb]=";;;"
-[base-aemv8a-latest-revb]=";;;"
+[base-aemv8a-revb]="${fvp_arm_std_library};FVP_Base_AEMvA-AEMvA"
+[base-aemv8a-latest-revb]="${fvp_arm_std_library};FVP_Base_AEMvA-AEMvA"
[base-aemva]=";;;"
[base-aemv8a-gic600ae]=";;;"
[foundationv8]="${foundation_platform};Foundation_Platform"
[base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
-[baser-aemv8r]=";;;"
[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]="${fvp_arm_std_library};FVP_Base_Cortex-A55"
[cortex-a55x4-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A75x4"
[cortex-a55x4-a76x2]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A76x2"
[cortex-a57x1-a53x1]="${fvp_arm_std_library};FVP_Base_Cortex-A57x1-A53x1"
[cortex-a57x2-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x2-A53x4"
[cortex-a57x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4"
[cortex-a57x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4-A53x4"
-[cortex-a65aex8]="${fvp_arm_std_library};FVP_Base_Cortex-A65AEx8"
-[cortex-a65x4]="${fvp_arm_std_library};FVP_Base_Cortex-A65x4"
+[cortex-a65aex8]="${fvp_arm_std_library};FVP_Base_Cortex-A65AE"
+[cortex-a65x4]="${fvp_arm_std_library};FVP_Base_Cortex-A65"
[cortex-a72x4]="${fvp_arm_std_library};FVP_Base_Cortex-A72x4"
[cortex-a72x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A72x4-A53x4"
[cortex-a73x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73x4"
[cortex-a73x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73x4-A53x4"
-[cortex-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A75x4"
-[cortex-a76aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A76AEx4"
-[cortex-a76aex2]="${fvp_arm_std_library};FVP_Base_Cortex-A76AEx2"
-[cortex-a76x4]="${fvp_arm_std_library};FVP_Base_Cortex-A76x4"
-[cortex-a77x4]="${fvp_arm_std_library};FVP_Base_Cortex-A77x4"
-[cortex-a78x4]="${fvp_arm_std_library};FVP_Base_Cortex-A78x4"
-[cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78Cx4"
-[cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2x4"
-[neoverse_e1x1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x1"
-[neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x2"
-[neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x4"
-[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1x4"
-[neoverse_n2]="${fvp_arm_std_library_11_12};FVP_Base_Neoverse-N1x4"
-[neoverse-v1x4]=";;;"
-[cortexa710x4]=";;;"
+[cortex-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A75"
+[cortex-a76aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A76AE"
+[cortex-a76aex2]="${fvp_arm_std_library};FVP_Base_Cortex-A76AE"
+[cortex-a76x4]="${fvp_arm_std_library};FVP_Base_Cortex-A76"
+[cortex-a77x4]="${fvp_arm_std_library};FVP_Base_Cortex-A77"
+[cortex-a78x4]="${fvp_arm_std_library};FVP_Base_Cortex-A78"
+[cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
+[cortex-x2]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-X2x4"
+[cortex-a710]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-A710x4"
+[neoverse_e1x1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
+[neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
+[neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
+[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
+[neoverse_n2]="${fvp_arm_std_library_11_16};FVP_Base_Neoverse-N1x4"
+[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
[css-rdv1]=";;;"
[css-rde1edge]=";;;"
[css-rdn1edge]=";;;"