feat(scp): scp/mcp v2.9.0 update - total compute
Updates total compute test suite to use v2.9.0 scp/mcp prebuilds
Signed-off-by: Maksims Svecovs <maksims.svecovs@arm.com>
Change-Id: I6dc9daeb5a18f2c44a97e54b9a4ddc3fd6d71b19
diff --git a/run_config/fvp-fip.tc b/run_config/fvp-fip.tc
index 7088366..56614f4 100644
--- a/run_config/fvp-fip.tc
+++ b/run_config/fvp-fip.tc
@@ -11,7 +11,7 @@
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_prebuilts/tc$plat_variant/scp_ramfw.bin" saveas="scp_ram.bin" fetch_file
+ url="$scp_prebuilts/tc$plat_variant/release/scp_bl2.bin" saveas="scp_ram.bin" fetch_file
archive_file "scp_ram.bin"
fi
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 1016f72..4ee3827 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -14,7 +14,7 @@
# 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_prebuilts/tc$plat_variant/scp_romfw.bin" saveas="scp_rom.bin" fetch_file
+ url="$scp_prebuilts/tc$plat_variant/release/scp_bl1.bin" saveas="scp_rom.bin" fetch_file
archive_file "scp_rom.bin"
fi
diff --git a/tc_utils.sh b/tc_utils.sh
index 60c06f4..c2f5f92 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -7,10 +7,10 @@
source "$ci_root/fvp_utils.sh"
-tc_prebuilts="${tc_prebuilts:-$tfa_downloads/total_compute/}"
+tc_prebuilts="${tc_prebuilts:-$tfa_downloads/total_compute}"
-# Pre-built SCP v2.8.0 release binaries
-scp_prebuilts="${scp_prebuilts:-$tfa_downloads/total_compute_scp_2.8.0/}"
+# Pre-built SCP binaries
+scp_prebuilts="${scp_prebuilts:-$scp_mcp_downloads}"
fvp_kernels[fvp-tc-kernel]="$tc_prebuilts/Image"
fvp_initrd_urls[fvp-tc-ramdisk]="$tc_prebuilts/uInitrd-busybox.0x88000000"