tc: Correct binary paths
TC3 has different paths for storing binaries. Adjust script for using
the correct paths for fetching them.
Change-Id: I7dd8a0f66a98f6fd58ccbb81ae5263605d4555f3
Signed-off-by: Leo Yan <leo.yan@arm.com>
diff --git a/run_config/fvp-fip.tc b/run_config/fvp-fip.tc
index 36d1a07..e966093 100644
--- a/run_config/fvp-fip.tc
+++ b/run_config/fvp-fip.tc
@@ -11,7 +11,11 @@
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+ if [ $plat_variant -eq 2 ]; then
+ url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+ elif [ $plat_variant -eq 3 ]; then
+ url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+ fi
archive_file "scp_ram.bin"
fi
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 91be806..1d01323 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -16,7 +16,12 @@
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_rom.bin" ]; then
# Pick the appropriate binary based on target platform variant
- url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
+ if [ $plat_variant -eq 2 ]; then
+ url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
+ elif [ $plat_variant -eq 3 ]; then
+ url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
+ fi
+
archive_file "scp_rom.bin"
fi
diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 552a52e..4a9e1db 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -9,7 +9,11 @@
post_tf_build() {
if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+ if [ $plat_variant -eq 2 ]; then
+ url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+ elif [ $plat_variant -eq 3 ]; then
+ url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+ fi
archive_file "scp_ram.bin"
fi
diff --git a/tc_utils.sh b/tc_utils.sh
index 8992f48..e237ad9 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -24,7 +24,12 @@
# AP bl1 0x00 is mapped to 0x70000000 in RSE memory map
ap_bl1_flash_load_addr=0x70000000
ap_bl1_flash_size=0x20000
-rse_revision="4ab7a20d"
+
+if [ $plat_variant -eq 2 ]; then
+ rse_revision="4ab7a20d"
+elif [ $plat_variant -eq 3 ]; then
+ rse_revision="cd8ece72a"
+fi
# Hafnium build repo containing Secure hafnium binaries
spm_secure_out_dir=secure_tc_clang