css(sgi): switch to SCP/MCP 2.8.0 release binaries

This patch changes usage of SCP binaries for
 rdn1edge
 rdn1edgex2
 rdv1
 sgi-575

platforms from 2.8.0-dev to 2.8.0 release.

All binaries are stored in corresponding subfolders
in common css_scp_2.8.0 folder.

Change-Id: Ib3c294cf308ba109632586aab837c033be1dee9b
Signed-off-by: Zelalem Aweke <zelalem.aweke@arm.com>
diff --git a/rdn1edge_utils.sh b/rdn1edge_utils.sh
index 1a34382..b2eb4dd 100644
--- a/rdn1edge_utils.sh
+++ b/rdn1edge_utils.sh
@@ -9,7 +9,7 @@
 
 sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdn1edge}"
 
-# Pre-built SCP/MCP v2.8.0-dev release binaries
+# Pre-built SCP/MCP v2.8.0 release binaries
 scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_280/sgi/rdn1edge}"
 
 fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
diff --git a/rdn1edgex2_utils.sh b/rdn1edgex2_utils.sh
index e5236cb..1c3663f 100644
--- a/rdn1edgex2_utils.sh
+++ b/rdn1edgex2_utils.sh
@@ -9,7 +9,7 @@
 
 sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdn1edgex2}"
 
-# Pre-built SCP/MCP v2.8.0-dev release binaries
+# Pre-built SCP/MCP v2.8.0 release binaries
 scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_280/sgi/rdn1edgex2}"
 
 fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
diff --git a/rdv1_utils.sh b/rdv1_utils.sh
index 69fedc8..549e7e3 100644
--- a/rdv1_utils.sh
+++ b/rdv1_utils.sh
@@ -9,7 +9,9 @@
 
 sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdv1}"
 
-scp_mcp_prebuilts="$sgi_prebuilts"
+# Pre-built SCP/MCP v2.8.0 release binaries
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_280/sgi/rdv1}"
+
 
 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-sgi575 b/run_config/fvp-sgi575
index bf35841..cbb58b0 100644
--- a/run_config/fvp-sgi575
+++ b/run_config/fvp-sgi575
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -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="$sgi_prebuilts/mcp_rom.bin" fetch_file
+		url="$scp_mcp_prebuilts/mcp_rom.bin" fetch_file
 		archive_file "mcp_rom.bin"
 	fi
 	if [ ! -f "$archive/scp_ram.bin" ]; then
-		url="$sgi_prebuilts/scp_ram.bin" fetch_file
+		url="$scp_mcp_prebuilts/scp_ram.bin" fetch_file
 		archive_file "scp_ram.bin"
 	fi
 	if [ ! -f "$archive/scp_rom.bin" ]; then
-		url="$sgi_prebuilts/scp_rom.bin" fetch_file
+		url="$scp_mcp_prebuilts/scp_rom.bin" fetch_file
 		archive_file "scp_rom.bin"
 	fi
 
diff --git a/sgi575_utils.sh b/sgi575_utils.sh
index 9f43f75..852a6d5 100644
--- a/sgi575_utils.sh
+++ b/sgi575_utils.sh
@@ -7,12 +7,10 @@
 
 source "$ci_root/fvp_utils.sh"
 
-# Pre-built SCP/MCP v2.8.0-dev release binaries
-# Files from
-# https://releases.linaro.org/members/arm/platforms/20.01/sgi575-latest-busybox-uefi.zip
-# Tianocore/EDK2 firmware version 2321f49f07 copied from
-# http://files.oss.arm.com/downloads/tf-a/css/sgi/sgi575
-sgi_prebuilts="${sgi_prebuilts:-$css_downloads_280/sgi/sgi575}"
+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}"
 
 fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
 fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
diff --git a/utils.sh b/utils.sh
index 24b9f67..20bb10d 100644
--- a/utils.sh
+++ b/utils.sh
@@ -335,9 +335,8 @@
 tfa_downloads="${tfa_downloads:-file:///downloads/tf-a}"
 css_downloads="${css_downloads:-$tfa_downloads/css}"
 
-# SCP/MCP v2.8.0-dev release binaries
-# Linux files from https://releases.linaro.org/members/arm/platforms/20.01
-css_downloads_280="${css_downloads_280:-$tfa_downloads/css_scp_2.8.0-dev}"
+# SCP/MCP v2.8.0 release binaries
+css_downloads_280="${css_downloads_280:-$tfa_downloads/css_scp_2.8.0}"
 
 linaro_2001_release="${linaro_2001_release:-$tfa_downloads/linaro/20.01}"
 linaro_release="${linaro_release:-$linaro_2001_release}"