commit 0b83409698c0cc3b03c65146bb7c5d3c87275802
author Olivier Deprez <olivier.deprez@arm.com> Fri Aug 21 08:36:01 2020 +0200
committer Zelalem <zelalem.aweke@arm.com> Mon Aug 24 14:35:04 2020 -0500
tree 5ad093a70e8bd23cb85c1120673fb1738389d426
parent 11ea6e0f55fd232998849b535fbcbb8b4d35b958

SPM: RESET_TO_BL31 add a third cactus partition

A third cactus sample test partition was added to tf-a-tests.
The test fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31 requires
the third partition to be preloaded when invoking the model as
BL1/BL2 do not exist in this test case.

Change-Id: I6bcb5b220718880cba8ec6077dd6b8877df8c22b
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>

fvp_utils.sh

diff --git a/fvp_utils.sh b/fvp_utils.sh
index 9bb8a34..42434dc 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -22,6 +22,7 @@
 spmc_manifest_addr="${spmc_addr:-0x0403f000}"
 sp1_addr="${sp1_addr:-0x7000000}"
 sp2_addr="${sp2_addr:-0x7100000}"
+sp3_addr="${sp3_addr:-0x7200000}"
 
 ns_bl1u_addr="${ns_bl1u_addr:-0x0beb8000}"
 fwu_fip_addr="${fwu_fip_addr:-0x08400000}"

model/fvp_common.sh

diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index f2baf40..d1a47a9 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -62,6 +62,7 @@
 ${spmc_manifest+--data ${data_instance}=$spmc_manifest@${spmc_manifest_addr:?}}
 ${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:?}}
 
 ${ns_bl1u_bin+--data ${data_instance}=$ns_bl1u_bin@$ns_bl1u_addr}
 ${fwu_fip_bin+--data ${data_instance}=$fwu_fip_bin@$fwu_fip_addr}

run_config/fvp-spm.rstbl31

diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index 24b9722..eb60c59 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -23,6 +23,7 @@
 	url="${tf_build_root}/${plat}/${mode}/fdts/fvp_spmc_manifest.dtb" fetch_file
 	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
 
 	archive_file "hafnium.bin"
 	archive_file "secure_hafnium.bin"
@@ -31,6 +32,7 @@
 	archive_file "fvp_spmc_manifest.dtb"
 	archive_file "cactus-primary.pkg"
 	archive_file "cactus-secondary.pkg"
+	archive_file "cactus-tertiary.pkg"
 }
 
 post_fetch_tf_resource() {
@@ -43,6 +45,7 @@
 	spm_bin="secure_hafnium.bin" \
 	sp1_pkg="cactus-primary.pkg" \
 	sp2_pkg="cactus-secondary.pkg" \
+	sp3_pkg="cactus-tertiary.pkg" \
 	initrd_bin="initrd.img" \
 	el3_payload_bin="manifest.dtb" \
 		gen_model_params