refactor: update Cortex-A32 to latest FVP version
The Cortex-A32 FVP model is pinned in the CI to FM 11.12 which is a
largely outdated version.
Migrate the following two test configs to latest FVP model version:
tf-l2-boot-tests-aarch32/fvp-aarch32-default,fvp-aarch32-default:
fvp-tftf.aarch32-fip.tftf-cortexa32x4-debug
tf-l2-boot-tests-aarch32/fvp-aarch32-default:
fvp-linux32-dtb.aarch32-fip.uboot32-cortexa32x4-debug
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I6c525367e7e47c51fdecac9968a1e08c9a187c2b
(cherry picked from commit f648fafe492ad35650b1424a8f6def9a80903c28)
diff --git a/fvp_utils.sh b/fvp_utils.sh
index c3ff847..1ac742b 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -41,7 +41,6 @@
default_model_dtb="dtb.bin"
# 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"
@@ -74,7 +73,7 @@
[base-aemv8a-gic600ae]="${fvp_base_aemv8a_gic600ae};FVP_Base_AEMv8A-GIC600AE"
[foundationv8]="${foundation_platform};Foundation_Platform"
[base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
-[cortex-a32x4]="${fvp_arm_std_library_11_12};FVP_Base_Cortex-A32x4"
+[cortex-a32x4]="${fvp_arm_std_library};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"