Revert "Fetch prebuilt OP-TEE binary from Linaro releases"
This reverts commit 3f3b51d35f915b98e9f1aadad3aa0e304c199c24.
Support for multi-threaded MPIDR values (which is required by the Base
AEM RevC FVP platform) was added into OPTEE version 3.8.0 (commit
8be2de1a7212d6f80588daa849be14e7fc9320d6).
Unfortunately, Linaro release 20.01 ships with OPTEE version 3.6.0,
which it is too old for that.
Change-Id: Ifa2487a233c74ef489a5f002c7720bc0e4d78e35
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index d270d56..dd1a443 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -32,8 +32,6 @@
backup_fip_addr="${backup_fip_addr:-0x09000000}"
romlib_addr="${romlib_addr:-0x03ff2000}"
-optee_fip_url="$linaro_release/fvp-ack-busybox-uboot/fip.bin"
-
uboot32_fip_url="$linaro_release/fvp32-latest-busybox-uboot/fip.bin"
rootfs_url="$linaro_release/lt-vexpress64-openembedded_minimal-armv8-gcc-5.2_20170127-761.img.gz"
@@ -115,13 +113,9 @@
)
get_optee_bin() {
- local tmpdir="$(mktempdir)"
-
- pushd "$tmpdir"
- extract_fip "$optee_fip_url"
- mv "tos-fw.bin" "bl32.bin"
+ url="$jenkins_url/job/tf-optee-build/PLATFORM_FLAVOR=fvp,label=arch-dev/lastSuccessfulBuild/artifact/artefacts/tee.bin" \
+ saveas="bl32.bin" fetch_file
archive_file "bl32.bin"
- popd
}
# For Measured Boot tests using a TA based on OPTEE, it is necessary to use a