commit 3db371b9795cb6d71babc876d1591f83dc0dbfd9
author Manish Pandey <manish.pandey2@arm.com> Mon Mar 11 09:58:53 2024 +0000
committer Paul Sokolovsky <paul.sokolovsky@linaro.org> Sat Aug 31 00:38:06 2024 +0200
tree 1f3b6da9fdc2302d58921480462ef6bdcbd4e0fc
parent 5adcd7d54d76ed869210e0f2868bd4337c5948e2

ci: use FVP_Base_RevC-2xAEMvA for aemva models

Currently base-aemv8a uses FVP_Base_RevC-2xAEMvA model, which is the
default choice whereas base-aemva is using FVP_Base_AEMvA model. To make
the a common naming let base-aemva also use the default model.

So after this patch both base-aemv8a and base-aemva are exactly same
which will be changed in a future patch to use only base-aemva
everywhere.

Change-Id: I2e071b504f755eae2b40ddecd5bb8df1def0d25e
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
(cherry picked from commit a60d807ca2a9977d9d240f64f963b5314051bf0c)

fvp_utils.sh

diff --git a/fvp_utils.sh b/fvp_utils.sh
index 5678b90..574b3da 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -48,7 +48,6 @@
 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}_${model_build};/opt/model/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502_pkg/models/${model_flavour}"
@@ -71,7 +70,7 @@
 [base-aemv8a-quad]="${fvp_base_aemv8a_aemv8a_aemv8a_aemv8a_ccn502};FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
 [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]="${fvp_base_aemva};FVP_Base_AEMvA"
+[base-aemva]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
 [base-aemv8a-gic600ae]="${fvp_base_aemv8a_gic600ae};FVP_Base_AEMv8A-GIC600AE"
 [base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
 [cortex-a32x4]="${fvp_arm_std_library};FVP_Base_Cortex-A32x4"