fvp: add AMUv1p1 to the all configs
amu_version=2 represents FEAT_AMUv1p1
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I9cdff4f354bde59e30a0e71d9e8dd57c817a724b
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 72326e6..fb8ca3c 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -217,6 +217,7 @@
${cluster_0_has_el2+-C cluster0.has_el2=$cluster_0_has_el2}
${amu_present+-C cluster0.has_amu=$amu_present}
+${amu_version+-C cluster0.amu_version=${amu_version}}
${reset_to_bl31+-C cluster0.cpu0.RVBAR=${bl31_addr:?}}
${reset_to_bl31+-C cluster0.cpu1.RVBAR=${bl31_addr:?}}
@@ -580,6 +581,7 @@
${cluster_1_has_el2+-C cluster1.has_el2=$cluster_1_has_el2}
${amu_present+-C cluster1.has_amu=$amu_present}
+${amu_version+-C cluster1.amu_version=${amu_version}}
${reset_to_bl31+-C cluster1.cpu0.RVBAR=${bl31_addr:?}}
${reset_to_bl31+-C cluster1.cpu1.RVBAR=${bl31_addr:?}}
diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all
index 67113e4..9ed07de 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -16,7 +16,7 @@
has_ete="1" \
has_sve="1" \
etm_present="1" \
- amu_present="1" \
+ amu_present="1" amu_version=2 \
has_sme="1" has_sme2="1" \
has_sme_fa64="1" \
has_mpam="1" \
diff --git a/run_config/fvp-aemv8a.all.bmcov b/run_config/fvp-aemv8a.all.bmcov
index c10048e..7fdf729 100644
--- a/run_config/fvp-aemv8a.all.bmcov
+++ b/run_config/fvp-aemv8a.all.bmcov
@@ -16,7 +16,7 @@
has_ete="1" \
has_sve="1" \
etm_present="1" \
- amu_present="1" \
+ amu_present="1" amu_version=2 \
has_sme="1" has_sme2="1" \
has_sme_fa64="1" \
has_mpam="1" \
diff --git a/run_config/fvp-spm.all b/run_config/fvp-spm.all
index 85e8336..645ed14 100644
--- a/run_config/fvp-spm.all
+++ b/run_config/fvp-spm.all
@@ -29,7 +29,7 @@
has_ete="1" \
has_sve="1" \
etm_present="1" \
- amu_present="1" \
+ amu_present="1" amu_version=2 \
has_sme="1" has_sme2="1" \
has_sme_fa64="1" \
has_mpam="1" \
diff --git a/run_config/fvp-spm.all.bmcov b/run_config/fvp-spm.all.bmcov
index ff018cf..c3b9485 100644
--- a/run_config/fvp-spm.all.bmcov
+++ b/run_config/fvp-spm.all.bmcov
@@ -33,7 +33,7 @@
has_ete="1" \
has_sve="1" \
etm_present="1" \
- amu_present="1" \
+ amu_present="1" amu_version=2 \
has_sme="1" has_sme2="1" \
has_sme_fa64="1" \
has_mpam="1" \