ci(ivy): load Ivy partition in spm reset to bl31
A fourth test partition has been introduced ("Ivy" S-EL0 partition
using an S-EL1 shim). For the case where BL2 is absent and BL31 is
built with RESET_TO_BL31 option, this new partition has to be
pre-loaded in the model command line.
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I0a5e05651738de6a28b95a0e23a15a744ba750f6
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 5c0f0f9..b2ad052 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -23,6 +23,7 @@
sp1_addr="${sp1_addr:-0x7000000}"
sp2_addr="${sp2_addr:-0x7100000}"
sp3_addr="${sp3_addr:-0x7200000}"
+sp4_addr="${sp4_addr:-0x7600000}"
# SPM out directories
export spm_secure_out_dir="${spm_secure_out_dir:-secure_aem_v8a_fvp_clang}"
export spm_non_secure_out_dir="${spm_non_secure_out_dir:-aem_v8a_fvp_clang}"
diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index 665a33a..87f2b10 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -69,6 +69,7 @@
${sp1_pkg+--data ${data_instance}=$sp1_pkg@${sp1_addr:?}}
${sp2_pkg+--data ${data_instance}=$sp2_pkg@${sp2_addr:?}}
${sp3_pkg+--data ${data_instance}=$sp3_pkg@${sp3_addr:?}}
+${sp4_pkg+--data ${data_instance}=$sp4_pkg@${sp4_addr:?}}
${ns_bl1u_bin+--data ${data_instance}=$ns_bl1u_bin@$ns_bl1u_addr}
${fwu_fip_bin+--data ${data_instance}=$fwu_fip_bin@$fwu_fip_addr}
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index 36031b5..9a8c3e2 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -20,11 +20,13 @@
url="${tf_build_root}/${plat}/${mode}/cactus-primary.pkg" fetch_file
url="${tf_build_root}/${plat}/${mode}/cactus-secondary.pkg" fetch_file
url="${tf_build_root}/${plat}/${mode}/cactus-tertiary.pkg" fetch_file
+ url="${tf_build_root}/${plat}/${mode}/ivy.pkg" fetch_file
archive_file "fvp_spmc_manifest.dtb"
archive_file "cactus-primary.pkg"
archive_file "cactus-secondary.pkg"
archive_file "cactus-tertiary.pkg"
+ archive_file "ivy.pkg"
}
fetch_tf_resource() {
@@ -56,6 +58,7 @@
sp1_pkg="cactus-primary.pkg" \
sp2_pkg="cactus-secondary.pkg" \
sp3_pkg="cactus-tertiary.pkg" \
+ sp4_pkg="ivy.pkg" \
initrd_bin="initrd.bin" \
el3_payload_bin="manifest.dtb" \
has_smmuv3_params="1" \