ci: update bl31 (no spmd) prebuilt to TF-A v2.8
As Trusty tests were removed from test runs [1], there is no longer a
dependency to BL31 image built with Trusty SPD and the downstream
Android TF-A fork.
Refresh prebuilts with upstream TF-A. Those binaries are used with tests
run through the test.sh script (either qemu or FVP platform) where the
SPMD is not required.
[1] https://review.trustedfirmware.org/c/hafnium/hafnium/+/16826
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I0c5c3b94eb4829bdf90d186039eeb754fc9a48ce
diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index 6c65b67..03daf98 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -47,10 +47,10 @@
"Linux64_GCC-9.3", "FVP_Base_RevC-2xAEMvA")
HF_PREBUILTS = os.path.join(HF_ROOT, "prebuilts")
QEMU_PREBUILTS = os.path.join(HF_PREBUILTS, MACHINE, "qemu", "qemu-system-aarch64")
-FVP_PREBUILTS_TFA_TRUSTY_ROOT = os.path.join(
- HF_PREBUILTS, "linux-aarch64", "trusted-firmware-a-trusty", "fvp")
+FVP_PREBUILTS_TFA_ROOT = os.path.join(
+ HF_PREBUILTS, "linux-aarch64", "trusted-firmware-a", "fvp")
FVP_PREBUILT_DTS = os.path.join(
- FVP_PREBUILTS_TFA_TRUSTY_ROOT, "fvp-base-gicv3-psci-1t.dts")
+ FVP_PREBUILTS_TFA_ROOT, "fvp-base-gicv3-psci-1t.dts")
FVP_PREBUILT_TFA_SPMD_ROOT = os.path.join(
HF_PREBUILTS, "linux-aarch64", "trusted-firmware-a-spmd", "fvp")
@@ -237,7 +237,7 @@
if self.tfa:
bl1_path = os.path.join(
- HF_PREBUILTS, "linux-aarch64", "trusted-firmware-a-trusty",
+ HF_PREBUILTS, "linux-aarch64", "trusted-firmware-a",
"qemu", "bl1.bin")
exec_args += ["-bios",
os.path.abspath(bl1_path),
@@ -434,7 +434,7 @@
@property
def FVP_PREBUILT_BL31(self):
- return os.path.join(FVP_PREBUILTS_TFA_TRUSTY_ROOT, "bl31.bin")
+ return os.path.join(FVP_PREBUILTS_TFA_ROOT, "bl31.bin")
@property
def HYPERVISOR_ADDRESS(self):