rme: use the common base-aemv8a FVP model for RME test configs
FVP version 11.16+ support RME, therefore use the common
base-aemv8a FVP model for RME test configs. The patch also
moves RME configs to more appropriate groups.
Change-Id: Ibb1daa5db7fd96f973ee3255b5888f67ab67e82c
Signed-off-by: Zelalem Aweke <zelalem.aweke@arm.com>
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 3d9d7be..751963e 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -170,6 +170,8 @@
${restriction_on_speculative_execution+-C cluster0.restriction_on_speculative_execution=$restriction_on_speculative_execution}
+${restriction_on_speculative_execution+-C cluster0.restriction_on_speculative_execution_aarch32=$restriction_on_speculative_execution}
+
${gicv3_ext_interrupt_range+-C cluster0.gicv3.extended-interrupt-range-support=$gicv3_ext_interrupt_range}
${mpidr_layout+-C cluster0.mpidr_layout=$mpidr_layout}
@@ -312,6 +314,8 @@
${restriction_on_speculative_execution+-C cluster1.restriction_on_speculative_execution=$restriction_on_speculative_execution}
+${restriction_on_speculative_execution+-C cluster1.restriction_on_speculative_execution_aarch32=$restriction_on_speculative_execution}
+
${gicv3_ext_interrupt_range+-C cluster1.gicv3.extended-interrupt-range-support=$gicv3_ext_interrupt_range}
${mpidr_layout+-C cluster1.mpidr_layout=$mpidr_layout}