refactor(spm): build Cactus/Ivy for L3 linux tests
For the two SPM tests booting Hafnium Hypervisor and linux:
spm-l3-boot-tests/fvp-default,fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31
spm-l3-boot-tests/fvp-default,fvp-spm,fvp-default:fvp-spm.linux
Building TF-A-tests for all targets creates binaries (el3_payload_bin,
ns_bl1u.bin) that are unnecessary for SPM test configs.
This generates side effects with CI image preloading scripts.
This change only builds Cactus/Ivy partitions images for L3 linux tests.
Hypervisor manifest is preloaded by using the dtb_bin/dtb_addr variables
(rather than el3_preload_bin).
Use the default name for init ramdisk (initrd_bin) and Hypervisor device
tree (dtb_bin).
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: If172fc59d2a4ddfad90f5ca2cb5f8c74eef1594c
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index e32b552..6e5e740 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -5,16 +5,21 @@
# SPDX-License-Identifier: BSD-3-Clause
#
+pre_tftf_build() {
+ # Build Cactus and Ivy images only
+ targets="cactus ivy" set_tftf_build_targets
+}
+
post_tf_build() {
build_fip BL33="$archive/hafnium.bin" BL32="$archive/secure_hafnium.bin"
}
fetch_tf_resource() {
url="$tfa_downloads/spm/07-29-2021/initrd.img" saveas="initrd.bin" fetch_file
- url="$tfa_downloads/spm/07-29-2021/manifest.dtb" fetch_file
+ url="$tfa_downloads/spm/07-29-2021/manifest.dtb" saveas="dtb.bin" fetch_file
archive_file "initrd.bin"
- archive_file "manifest.dtb"
+ archive_file "dtb.bin"
# Expect scripts
uart="0" file="spm-linux-uart0.exp" track_expect
@@ -30,10 +35,9 @@
arch_version="8.5" \
has_branch_target_exception="1" \
restriction_on_speculative_execution="2" \
- initrd_bin="initrd.bin" \
- el3_payload_bin="manifest.dtb" \
+ dtb_addr=0x80000000 \
has_smmuv3_params="1" \
gen_model_params
- model="$model" model_dtb="manifest.dtb" gen_fvp_yaml
+ model="$model" model_dtb="dtb.bin" gen_fvp_yaml
}