Fix download url paths for Measured Boot+fTPM tests.
Change-Id: I798bb7d476c0cc01003e8fc18b22293581c95ba5
Signed-off-by: Javier Almansa Sobrino <javier.almansasobrino@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 8c146cd..b511a5f 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -61,15 +61,15 @@
# For Measured Boot tests using a TA based on OPTEE, it is necessary to use a
# specific build rather than the default one generated by Jenkins.
get_ftpm_optee_bin() {
- url="${nfs_volume}/pdsw/downloads/tf-a/ftpm/optee/tee-header_v2.bin" \
+ url="$tfa_downloads/ftpm/optee/tee-header_v2.bin" \
saveas="bl32.bin" fetch_file
archive_file "bl32.bin"
- url="${nfs_volume}/pdsw/downloads/tf-a/ftpm/optee/tee-pager_v2.bin" \
+ url="$tfa_downloads/ftpm/optee/tee-pager_v2.bin" \
saveas="bl32_extra1.bin" fetch_file
archive_file "bl32_extra1.bin"
- url="${nfs_volume}/pdsw/downloads/tf-a/ftpm/optee/tee-pageable_v2.bin" \
+ url="$tfa_downloads/ftpm/optee/tee-pageable_v2.bin" \
saveas="bl32_extra2.bin" fetch_file
archive_file "bl32_extra2.bin"
}
diff --git a/run_config/fvp-linux.rootfs+ftpm b/run_config/fvp-linux.rootfs+ftpm
index cbf8213..ce346ca 100644
--- a/run_config/fvp-linux.rootfs+ftpm
+++ b/run_config/fvp-linux.rootfs+ftpm
@@ -7,8 +7,8 @@
post_tf_build() {
# Get the images for the test.
- edk_url="${nfs_volume}/pdsw/downloads/tf-a/ftpm/FVP_AARCH64_EFI.fd"
- rootfs_url="${nfs_volume}/pdsw/downloads/tf-a/ftpm/boot-fat.uefi.img" get_rootfs
+ edk_url="$tfa_downloads/ftpm/FVP_AARCH64_EFI.fd"
+ rootfs_url="$tfa_downloads/ftpm/boot-fat.uefi.img" get_rootfs
url="$edk_url" saveas="edk2.bin" fetch_file
archive_file "edk2.bin"