feat(scp): scp/mcp v2.9.0 update - rdv1
Updates rdv1 test suite to use v2.9.0 scp/mcp prebuilds
Signed-off-by: Maksims Svecovs <maksims.svecovs@arm.com>
Change-Id: Id6daccb01824cdb84f6d7202b7ef5596fd6447db
diff --git a/rdv1_utils.sh b/rdv1_utils.sh
index 549e7e3..4b2c446 100644
--- a/rdv1_utils.sh
+++ b/rdv1_utils.sh
@@ -9,8 +9,8 @@
sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdv1}"
-# Pre-built SCP/MCP v2.8.0 release binaries
-scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_280/sgi/rdv1}"
+# Pre-built SCP/MCP binaries
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/rdv1/release}"
fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
diff --git a/run_config/fvp-rdv1 b/run_config/fvp-rdv1
index bd875c1..38ea52c 100644
--- a/run_config/fvp-rdv1
+++ b/run_config/fvp-rdv1
@@ -8,15 +8,15 @@
fetch_tf_resource() {
# Fetch the pre-built SCP/MCP binaries if they haven't been built
if [ ! -f "$archive/mcp_rom.bin" ]; then
- url="$scp_mcp_prebuilts/mcp_rom.bin" fetch_file
+ url="$scp_mcp_prebuilts/mcp_romfw.bin" saveas="mcp_rom.bin" fetch_file
archive_file "mcp_rom.bin"
fi
if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/scp_ram.bin" fetch_file
+ url="$scp_mcp_prebuilts/scp_bl2.bin" saveas="scp_ram.bin" fetch_file
archive_file "scp_ram.bin"
fi
if [ ! -f "$archive/scp_rom.bin" ]; then
- url="$scp_mcp_prebuilts/scp_rom.bin" fetch_file
+ url="$scp_mcp_prebuilts/scp_bl1.bin" saveas="scp_rom.bin" fetch_file
archive_file "scp_rom.bin"
fi