commit 71a885ad791b6761791393f6bad80e845f420f25
author Maksims Svecovs <maksims.svecovs@arm.com> Thu Oct 21 14:29:29 2021 +0100
committer Zelalem Aweke <zelalem.aweke@arm.com> Mon Nov 01 15:23:38 2021 +0100
tree 5a7866fb691806e5ac98a94ec72dea75963a88b0
parent 839f490a19423b553a8d6bf33bb28864d0ba65ec

feat(scp): scp/mcp v2.9.0 update - sgi575

Updates sgi575 test suite to use v2.9.0 scp/mcp prebuilds

Signed-off-by: Maksims Svecovs <maksims.svecovs@arm.com>
Change-Id: Idd5ba30290d430fc218a6a647a255c4afd478b08

model/css-sgi575.sh

diff --git a/model/css-sgi575.sh b/model/css-sgi575.sh
index adc38e3..981406e 100644
--- a/model/css-sgi575.sh
+++ b/model/css-sgi575.sh
@@ -22,4 +22,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

run_config/fvp-sgi575

diff --git a/run_config/fvp-sgi575 b/run_config/fvp-sgi575
index cbb58b0..028ea09 100644
--- a/run_config/fvp-sgi575
+++ b/run_config/fvp-sgi575
@@ -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
 

sgi575_utils.sh

diff --git a/sgi575_utils.sh b/sgi575_utils.sh
index 852a6d5..0e20b8d 100644
--- a/sgi575_utils.sh
+++ b/sgi575_utils.sh
@@ -9,8 +9,8 @@
 
 sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/sgi575}"
 
-# Pre-built SCP/MCP v2.8.0 release binaries
-scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_280/sgi/sgi575}"
+# Pre-built SCP/MCP binaries
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/sgi575/release}"
 
 fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
 fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"