feat(scp): scp/mcp v2.10.0 update - morello
Updates morello test suite to use v2.10.0 scp/mcp prebuilt binaries
Signed-off-by: Jayanth Dodderi Chidanand <jayanthdodderi.chidanand@arm.com>
Change-Id: I50ed8648345a678533eb8a74e948fb227c2fbd57
diff --git a/morello_utils.sh b/morello_utils.sh
index a338d09..2a60327 100644
--- a/morello_utils.sh
+++ b/morello_utils.sh
@@ -8,7 +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"}
-# TODO: Restore this path once the SCP release v2.10 binaries are generated
-#scp_mcp_prebuilts=${scp_mcp_prebuilts:="$scp_mcp_downloads/morello/release"}
-scp_mcp_prebuilts=${scp_mcp_prebuilts:="$tfa_downloads/morello"}
+uefi_addr=0x14200000
diff --git a/run_config/fvp-fip.morello b/run_config/fvp-fip.morello
index c59d202..31e6a98 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="$scp_mcp_prebuilts/mcp_romfw.bin" saveas="mcp_rom.bin" fetch_file
+ url="$scp_mcp_prebuilts/morello-mcp-bl1.bin" saveas="mcp_rom.bin" fetch_file
archive_file "mcp_rom.bin"
fi
if [ ! -f "$archive/scp_rom.bin" ]; then
- url="$scp_mcp_prebuilts/scp_bl1.bin" saveas="scp_rom.bin" fetch_file
+ url="$scp_mcp_prebuilts/morello-bl1.bin" saveas="scp_rom.bin" fetch_file
archive_file "scp_rom.bin"
fi
if [ ! -f "$archive/mcp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/mcp_ramfw.bin" saveas="mcp_ram.bin" fetch_file
+ url="$scp_mcp_prebuilts/morello-fvp-mcp-bl2.bin" saveas="mcp_ram.bin" fetch_file
archive_file "mcp_ram.bin"
fi
if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/scp_bl2.bin" saveas="scp_ram.bin" fetch_file
+ url="$scp_mcp_prebuilts/morello-fvp-bl2.bin" saveas="scp_ram.bin" fetch_file
archive_file "scp_ram.bin"
fi