feat(scp): scp/mcp v2.9.0 update - rdn1e1
Updates rdn1edge and rdn1edgex2 test suite to use v2.9.0 scp/mcp
prebuilds
Signed-off-by: Maksims Svecovs <maksims.svecovs@arm.com>
Change-Id: I18bfee67250b61cc1fd1f755b21caba920f79d52
diff --git a/model/css-rdn1edge.sh b/model/css-rdn1edge.sh
index 5ac1f7a..0ee16f0 100644
--- a/model/css-rdn1edge.sh
+++ b/model/css-rdn1edge.sh
@@ -23,4 +23,5 @@
-C soc.pl011_uart0.unbuffered_output=1
-C soc.pl011_uart1.unbuffered_output=1
--data css.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
+--data css.mcp.armcortexm7ct=$mcp_ram_bin@0x0BF80000
EOF
diff --git a/rdn1edge_utils.sh b/rdn1edge_utils.sh
index b2eb4dd..3195717 100644
--- a/rdn1edge_utils.sh
+++ b/rdn1edge_utils.sh
@@ -9,8 +9,8 @@
sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdn1edge}"
-# Pre-built SCP/MCP v2.8.0 release binaries
-scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_280/sgi/rdn1edge}"
+# Pre-built SCP/MCP binaries
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/rdn1e1/release}"
fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
diff --git a/rdn1edgex2_utils.sh b/rdn1edgex2_utils.sh
index 1c3663f..8c844c4 100644
--- a/rdn1edgex2_utils.sh
+++ b/rdn1edgex2_utils.sh
@@ -9,8 +9,8 @@
sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdn1edgex2}"
-# Pre-built SCP/MCP v2.8.0 release binaries
-scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_280/sgi/rdn1edgex2}"
+# Pre-built SCP/MCP binaries
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/rdn1e1/release}"
fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
diff --git a/run_config/fvp-rdn1edge b/run_config/fvp-rdn1edge
index 002457e..2063f8b 100644
--- a/run_config/fvp-rdn1edge
+++ b/run_config/fvp-rdn1edge
@@ -7,16 +7,20 @@
fetch_tf_resource() {
# Fetch the pre-built SCP/MCP binaries if they haven't been built
+ if [ ! -f "$archive/mcp_ram.bin" ]; then
+ url="$scp_mcp_prebuilts/mcp_ramfw.bin" saveas="mcp_ram.bin" fetch_file
+ archive_file "mcp_ram.bin"
+ fi
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
diff --git a/run_config/fvp-rdn1edgex2 b/run_config/fvp-rdn1edgex2
index ac5f575..38458fb 100644
--- a/run_config/fvp-rdn1edgex2
+++ b/run_config/fvp-rdn1edgex2
@@ -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