fvp: cleanup neoverse_e1 model usage
Model option 'gicd_virtual_lpi' is not been used by neoverse_e1 FVP
model, so remove the unused option which is not been set by run_config
and remove duplicated model files.
This patch is direct outcome from code review comments from here:
https://review.trustedfirmware.org/c/ci/tf-a-ci-scripts/+/29474/3?tab=comments
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
Change-Id: I69c2b19a72232c4d2a1bc7134f4381f1142b783d
(cherry picked from commit 820d06ac13832c10a016ce214c510f55e69139eb)
diff --git a/fvp_utils.sh b/fvp_utils.sh
index ba326f1..3dd2e3a 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -89,9 +89,7 @@
[cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
[cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2"
[cortex-a710]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
-[neoverse_e1x1]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
-[neoverse_e1x2]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
-[neoverse_e1x4]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
+[neoverse_e1]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
[neoverse_n2]="${fvp_arm_std_library};FVP_Base_Neoverse-N2"
[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"