fix(scp): Add support for mcp ram binaries for RDV1
The more recent SCP binaries used for RDV1 require the
MCP ram firmware to be taken from pre-built and passed to
the FVP.
This patch adds support for the above.
Change-Id: I549bcd1814ff8e51faccbca8b895e3a72f392b58
Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>
diff --git a/model/css-rdv1.sh b/model/css-rdv1.sh
index 8744913..a3956ed 100644
--- a/model/css-rdv1.sh
+++ b/model/css-rdv1.sh
@@ -24,4 +24,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@$mcp_ram_addr
EOF
diff --git a/rdv1_utils.sh b/rdv1_utils.sh
index 4b2c446..7884aeb 100644
--- a/rdv1_utils.sh
+++ b/rdv1_utils.sh
@@ -17,4 +17,4 @@
fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
scp_ram_addr=0x0bd80000
-mcp_ram_addr=0x0be00000
+mcp_ram_addr=0x0BF80000
diff --git a/run_config/fvp-rdv1 b/run_config/fvp-rdv1
index 38ea52c..fee04b7 100644
--- a/run_config/fvp-rdv1
+++ b/run_config/fvp-rdv1
@@ -7,6 +7,10 @@
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_romfw.bin" saveas="mcp_rom.bin" fetch_file
archive_file "mcp_rom.bin"