spm: update static binaries to spm-12-03-2020
Move static binaries required for SPM testing to:
/arm/pdsw/downloads/tf-a/spm/12-03-2020
Hafnium binaries are no longer stored as static binaries
provided Hafnium is now built from sources in TF-A CI.
Re-order CI hooks.
Log UART0/1/2 for all SPM tests.
OP-TEE SP manifest moved to FVP platform dependent directory.
Remove ls command emitted from build package script as cksum
already prints Hafnium output file names.
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I7204d42dda5e2f0971b4708356c693fea558b710
diff --git a/run_config/fvp-spm b/run_config/fvp-spm
index 75d4923..b53774c 100644
--- a/run_config/fvp-spm
+++ b/run_config/fvp-spm
@@ -9,6 +9,12 @@
build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"
}
+fetch_tf_resource() {
+ # Expect scripts
+ uart="0" file="tftf.exp" track_expect
+ uart="2" file="spm-uart2.exp" track_expect
+}
+
post_fetch_tf_resource() {
model="base-aemv8a" \
arch_version="8.4" \
@@ -18,9 +24,3 @@
model_bin="FVP_Base_AEMv8A-AEMv8A" \
gen_fvp_yaml
}
-
-fetch_tf_resource() {
- # Expect scripts
- uart="0" file="tftf.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
-}
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index b05f714..1757515 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -6,13 +6,19 @@
#
post_tf_build() {
- url="$project_filer/ci-files/spm-10-23-2020/initrd.img" fetch_file
- url="$project_filer/ci-files/spm-10-23-2020/manifest.dtb" fetch_file
+ build_fip BL33="$archive/hafnium.bin" BL32="$archive/secure_hafnium.bin"
+}
+
+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
archive_file "initrd.img"
archive_file "manifest.dtb"
- build_fip BL33="$archive/hafnium.bin" BL32="$archive/secure_hafnium.bin"
+ # Expect scripts
+ uart="0" file="spm-linux-uart0.exp" track_expect
+ uart="2" file="spm-uart2.exp" track_expect
}
post_fetch_tf_resource() {
@@ -26,9 +32,3 @@
model_bin="FVP_Base_AEMv8A-AEMv8A" \
gen_fvp_yaml
}
-
-fetch_tf_resource() {
- # Expect scripts
- uart="0" file="spm-linux-uart0.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
-}
diff --git a/run_config/fvp-spm.optee b/run_config/fvp-spm.optee
index 92034ff..e3d5f74 100644
--- a/run_config/fvp-spm.optee
+++ b/run_config/fvp-spm.optee
@@ -6,13 +6,19 @@
#
post_tf_build() {
- url="$project_filer/ci-files/spm-10-23-2020/spmc_sel1_optee_sel1.bin" fetch_file
+ url="$tfa_downloads/spm/12-03-2020/spmc_sel1_optee_sel1.bin" fetch_file
archive_file "spmc_sel1_optee_sel1.bin"
build_fip BL33="$archive/tftf.bin" BL32="$archive/spmc_sel1_optee_sel1.bin"
}
+fetch_tf_resource() {
+ # Expect scripts
+ uart="0" file="tftf.exp" track_expect
+ uart="1" file="hold_uart.exp" track_expect
+}
+
post_fetch_tf_resource() {
model="base-aemv8a" \
gen_model_params
@@ -21,8 +27,3 @@
model_bin="FVP_Base_AEMv8A-AEMv8A" \
gen_fvp_yaml
}
-
-fetch_tf_resource() {
- # Expect scripts
- uart="0" file="tftf.exp" track_expect
-}
diff --git a/run_config/fvp-spm.optee.sp b/run_config/fvp-spm.optee.sp
index 099d07f..bcf7240 100644
--- a/run_config/fvp-spm.optee.sp
+++ b/run_config/fvp-spm.optee.sp
@@ -6,17 +6,16 @@
#
post_tf_build() {
- url="$project_filer/ci-files/spm-10-23-2020/spmc_sel2_optee_sel1.bin" fetch_file
+ url="$tfa_downloads/spm/12-03-2020/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}"
cat <<EOF > "${tf_root}/build/fvp/${bin_mode}/optee_sp_layout.json"
{
"op-tee" : {
"image": "spmc_sel2_optee_sel1.bin",
- "pm": "${tf_root}/fdts/optee_sp_manifest.dts"
+ "pm": "${tf_root}/plat/arm/board/fvp/fdts/optee_sp_manifest.dts"
}
}
EOF
@@ -24,6 +23,12 @@
build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"
}
+fetch_tf_resource() {
+ # Expect scripts
+ uart="0" file="tftf.exp" track_expect
+ uart="1" file="spm-optee-sp-uart1.exp" track_expect
+}
+
post_fetch_tf_resource() {
model="base-aemv8a" \
arch_version="8.4" \
@@ -33,9 +38,3 @@
model_bin="FVP_Base_AEMv8A-AEMv8A" \
gen_fvp_yaml
}
-
-fetch_tf_resource() {
- # Expect scripts
- uart="0" file="tftf.exp" track_expect
- uart="1" file="spm-optee-sp-uart1.exp" track_expect
-}
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index 7c7e6a5..9d5338f 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -16,21 +16,29 @@
build_fip BL33="$dummy_file" BL32="$dummy_file"
- url="$project_filer/ci-files/spm-10-23-2020/initrd.img" fetch_file
- url="$project_filer/ci-files/spm-10-23-2020/manifest.dtb" fetch_file
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 "initrd.img"
- archive_file "manifest.dtb"
archive_file "fvp_spmc_manifest.dtb"
archive_file "cactus-primary.pkg"
archive_file "cactus-secondary.pkg"
archive_file "cactus-tertiary.pkg"
}
+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
+
+ archive_file "initrd.img"
+ archive_file "manifest.dtb"
+
+ # Expect scripts
+ uart="0" file="spm-linux-uart0.exp" track_expect
+ uart="2" file="spm-uart2.exp" track_expect
+}
+
post_fetch_tf_resource() {
model="base-aemv8a" \
arch_version="8.4" \
@@ -50,9 +58,3 @@
model_bin="FVP_Base_AEMv8A-AEMv8A" \
gen_fvp_yaml
}
-
-fetch_tf_resource() {
- # Expect scripts
- uart="0" file="spm-linux-uart0.exp" track_expect
- uart="2" file="spm-uart2.exp" track_expect
-}
diff --git a/script/build_package.sh b/script/build_package.sh
index e9195c2..f4ea34b 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -1345,7 +1345,6 @@
build_spm
# Show SPM/Hafnium binary details
- ls -lart $spm_build_root/hafnium.bin $hafnium_build_root/hafnium.bin
cksum $spm_build_root/hafnium.bin $hafnium_build_root/hafnium.bin
secure_from="$spm_build_root" non_secure_from="$hafnium_build_root" to="$archive" collect_spm_artefacts