CI: Use SCP/MCP v2.7.0 release binaries for CSS platforms
This patch makes use of SCP/MCP v2.7.0 release binaries
for the following FVP CSS platforms:
- rddaniel
- rdn1edge
- rdn1edgex2
- sgi575
- sgm775
- tc0
For sgi575 and sgm775 prebuilt binaries are also updated
from https://releases.linaro.org/members/arm/platforms/20.01
Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
Change-Id: Iff561e3aad9f28670066ef53b878128a96f6a697
diff --git a/rddaniel_utils.sh b/rddaniel_utils.sh
index 75ff3a3..4ad0d2f 100644
--- a/rddaniel_utils.sh
+++ b/rddaniel_utils.sh
@@ -9,6 +9,9 @@
sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rddaniel}"
+# Pre-built SCP/MCP v2.7.0 release binaries
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_270/sgi/rddaniel}"
+
fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
diff --git a/rdn1edge_utils.sh b/rdn1edge_utils.sh
index a6424b3..e8908bc 100644
--- a/rdn1edge_utils.sh
+++ b/rdn1edge_utils.sh
@@ -9,6 +9,9 @@
sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdn1edge}"
+# Pre-built SCP/MCP v2.7.0 release binaries
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_270/sgi/rdn1edge}"
+
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 8a81c01..3a1477c 100644
--- a/rdn1edgex2_utils.sh
+++ b/rdn1edgex2_utils.sh
@@ -9,6 +9,9 @@
sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdn1edgex2}"
+# Pre-built SCP/MCP v2.7.0 release binaries
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_270/sgi/rdn1edgex2}"
+
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-fip.tc0 b/run_config/fvp-fip.tc0
index d1b1368..bf78d48 100644
--- a/run_config/fvp-fip.tc0
+++ b/run_config/fvp-fip.tc0
@@ -11,7 +11,7 @@
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_ramfw.bin" ]; then
- url="$tc_prebuilts/scp_ramfw.bin" fetch_file
+ url="$scp_prebuilts/scp_ramfw.bin" fetch_file
archive_file "scp_ramfw.bin"
fi
diff --git a/run_config/fvp-rddaniel b/run_config/fvp-rddaniel
index c96c07f..c397df4 100644
--- a/run_config/fvp-rddaniel
+++ b/run_config/fvp-rddaniel
@@ -6,17 +6,17 @@
#
fetch_tf_resource() {
- #Fetch the pre-built SCP/MCP binaries if they haven't been built
+ # 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/run_config/fvp-rdn1edge b/run_config/fvp-rdn1edge
index d5d0dbd..aabe571 100644
--- a/run_config/fvp-rdn1edge
+++ b/run_config/fvp-rdn1edge
@@ -6,17 +6,17 @@
#
fetch_tf_resource() {
- #Fetch the pre-built SCP/MCP binaries if they haven't been built
+ # 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/run_config/fvp-rdn1edgex2 b/run_config/fvp-rdn1edgex2
index b499003..a89ffc6 100644
--- a/run_config/fvp-rdn1edgex2
+++ b/run_config/fvp-rdn1edgex2
@@ -6,17 +6,17 @@
#
fetch_tf_resource() {
- #Fetch the pre-built SCP/MCP binaries if they haven't been built
+ # 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/run_config/fvp-sgi575 b/run_config/fvp-sgi575
index 4f20ec0..56ba556 100644
--- a/run_config/fvp-sgi575
+++ b/run_config/fvp-sgi575
@@ -6,7 +6,7 @@
#
fetch_tf_resource() {
- #Fetch the pre-built SCP/MCP binaries if they haven't been built
+ # 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
archive_file "mcp_rom.bin"
diff --git a/run_config/fvp-tc0 b/run_config/fvp-tc0
index 093b4d1..7cd0555 100644
--- a/run_config/fvp-tc0
+++ b/run_config/fvp-tc0
@@ -8,7 +8,7 @@
fetch_tf_resource() {
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_romfw.bin" ]; then
- url="$tc_prebuilts/scp_romfw.bin" fetch_file
+ url="$scp_prebuilts/scp_romfw.bin" fetch_file
archive_file "scp_romfw.bin"
fi
diff --git a/sgi575_utils.sh b/sgi575_utils.sh
index b81d113..bcc5f41 100644
--- a/sgi575_utils.sh
+++ b/sgi575_utils.sh
@@ -7,7 +7,12 @@
source "$ci_root/fvp_utils.sh"
-sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/sgi575}"
+# Pre-built SCP/MCP v2.7.0 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_270/sgi/sgi575}"
fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
diff --git a/sgm775_utils.sh b/sgm775_utils.sh
index b751b9d..0028bce 100644
--- a/sgm775_utils.sh
+++ b/sgm775_utils.sh
@@ -7,7 +7,10 @@
source "$ci_root/fvp_utils.sh"
-sgm_prebuilts="${sgm_prebuilts:-$css_downloads/sgm/sgm775}"
+# Pre-built SCP v2.7.0 release binaries
+# Files from
+# https://releases.linaro.org/members/arm/platforms/20.01/sgm775-ack-busybox-uboot.zip
+sgm_prebuilts="${sgm_prebuilts:-$css_downloads_270/sgm/sgm775}"
fvp_kernels[fvp-sgm-kernel]="$sgm_prebuilts/uImage.0x80080000.mobile_bb"
fvp_initrd_urls[fvp-sgm-ramdisk]="$sgm_prebuilts/uInitrd-busybox.0x88000000"
diff --git a/tc0_utils.sh b/tc0_utils.sh
index 895ec87..993d7e5 100644
--- a/tc0_utils.sh
+++ b/tc0_utils.sh
@@ -9,6 +9,9 @@
tc_prebuilts="${tc_prebuilts:-$tfa_downloads/total_compute/tc0}"
+# Pre-built SCP v2.7.0 release binaries
+scp_prebuilts="${scp_prebuilts:-$tfa_downloads/total_compute_scp_2.7.0/tc0}"
+
fvp_kernels[fvp-tc-kernel]="$tc_prebuilts/Image"
fvp_initrd_urls[fvp-tc-ramdisk]="$tc_prebuilts/uInitrd-busybox.0x88000000"
diff --git a/utils.sh b/utils.sh
index 47a2df9..66398f1 100644
--- a/utils.sh
+++ b/utils.sh
@@ -317,6 +317,10 @@
tfa_downloads="${tfa_downloads:-file:///downloads/tf-a}"
css_downloads="${css_downloads:-$tfa_downloads/css}"
+# SCP/MCP v2.7.0 release binaries
+# Linux files from https://releases.linaro.org/members/arm/platforms/20.01
+css_downloads_270="${css_downloads_270:-$tfa_downloads/css_scp_2.7.0}"
+
linaro_2001_release="$tfa_downloads/linaro/20.01"
linaro_release="${linaro_release:-$linaro_2001_release}"