feat(scp): scp/mcp v2.9.0 update - morello
Updates morello test suite to use v2.9.0 scp/mcp prebuilds
Signed-off-by: Maksims Svecovs <maksims.svecovs@arm.com>
Change-Id: I46e9ca60c9195868603810938970336efc4ff8e6
diff --git a/morello_utils.sh b/morello_utils.sh
index d1f00cf..c592917 100644
--- a/morello_utils.sh
+++ b/morello_utils.sh
@@ -8,5 +8,6 @@
source "$ci_root/fvp_utils.sh"
morello_prebuilts=${morello_prebuilts:="$tfa_downloads/morello"}
+scp_mcp_prebuilts=${scp_mcp_prebuilts:="$scp_mcp_downloads/morello/release"}
uefi_addr=0x14200000
diff --git a/run_config/fvp-fip.morello b/run_config/fvp-fip.morello
index 302f71a..fc8e2ca 100644
--- a/run_config/fvp-fip.morello
+++ b/run_config/fvp-fip.morello
@@ -7,22 +7,22 @@
post_tf_build() {
#Fetch pre-built SCP/MCP binaries if they haven't been built
if [ ! -f "$archive/mcp_rom.bin" ]; then
- url="$morello_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_rom.bin" ]; then
- url="$morello_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
if [ ! -f "$archive/scp_ramfw_fvp.bin" ]; then
- url="$morello_prebuilts/scp_ramfw_fvp.bin" fetch_file
+ url="$scp_mcp_prebuilts/scp_bl2.bin" saveas="scp_ramfw_fvp.bin" fetch_file
archive_file "scp_ramfw_fvp.bin"
fi
if [ ! -f "$archive/mcp_ramfw_fvp.bin" ]; then
- url="$morello_prebuilts/mcp_ramfw_fvp.bin" fetch_file
+ url="$scp_mcp_prebuilts/mcp_ramfw.bin" saveas="mcp_ramfw_fvp.bin" fetch_file
archive_file "mcp_ramfw_fvp.bin"
fi