spm: update static binaries to 02-05-2021
Update static binaries required for SPM testing to:
/arm/pdsw/downloads/tf-a/spm/02-05-2021
OP-TEE binaries (as S-EL1 SPMC or S-EL1 SP) are rebuilt to use the newly
introduced FFA_SECONDARY_EP_REGISTER ABI at boot time.
Added a statement to hold UART1 for spm-optee-sp-uart1.exp expect script
as this was triggering test failures due to test aborting early.
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: Ia8b0ed69cf9407b5082a404accf4983d1ad989c2
diff --git a/expect/spm-optee-sp-uart1.exp b/expect/spm-optee-sp-uart1.exp
index 9c97617..c874551 100644
--- a/expect/spm-optee-sp-uart1.exp
+++ b/expect/spm-optee-sp-uart1.exp
@@ -24,4 +24,5 @@
}
}
-exit_uart 0
+# Hold UART until test completes
+source [file join [file dirname [info script]] uart-hold.inc]
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index 330d060..23f0c76 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -10,8 +10,8 @@
}
fetch_tf_resource() {
- url="$tfa_downloads/spm/12-03-2020/initrd.img" fetch_file
- url="$tfa_downloads/spm/12-03-2020/manifest.dtb" fetch_file
+ url="$tfa_downloads/spm/02-05-2021/initrd.img" fetch_file
+ url="$tfa_downloads/spm/02-05-2021/manifest.dtb" fetch_file
archive_file "initrd.img"
archive_file "manifest.dtb"
diff --git a/run_config/fvp-spm.optee b/run_config/fvp-spm.optee
index 898097c..1e21b66 100644
--- a/run_config/fvp-spm.optee
+++ b/run_config/fvp-spm.optee
@@ -6,7 +6,7 @@
#
post_tf_build() {
- url="$tfa_downloads/spm/12-03-2020/spmc_sel1_optee_sel1.bin" fetch_file
+ url="$tfa_downloads/spm/02-05-2021/spmc_sel1_optee_sel1.bin" fetch_file
archive_file "spmc_sel1_optee_sel1.bin"
diff --git a/run_config/fvp-spm.optee.sp b/run_config/fvp-spm.optee.sp
index 6847a70..ca3981c 100644
--- a/run_config/fvp-spm.optee.sp
+++ b/run_config/fvp-spm.optee.sp
@@ -6,7 +6,7 @@
#
post_tf_build() {
- url="$tfa_downloads/spm/12-03-2020/spmc_sel2_optee_sel1.bin" fetch_file
+ url="$tfa_downloads/spm/02-05-2021/spmc_sel2_optee_sel1.bin" fetch_file
archive_file "spmc_sel2_optee_sel1.bin"
cp "${archive}/spmc_sel2_optee_sel1.bin" "${tf_root}/build/fvp/${bin_mode}"
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index a7d310e..fa67208 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -28,8 +28,8 @@
}
fetch_tf_resource() {
- url="$tfa_downloads/spm/12-03-2020/initrd.img" fetch_file
- url="$tfa_downloads/spm/12-03-2020/manifest.dtb" fetch_file
+ url="$tfa_downloads/spm/02-05-2021/initrd.img" fetch_file
+ url="$tfa_downloads/spm/02-05-2021/manifest.dtb" fetch_file
archive_file "initrd.img"
archive_file "manifest.dtb"