use latest SCP binaries v2.13.0
Use prebuilt binaries as per the latest release: v2.13.0.
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Change-Id: I2f1e61e319424ca8d30cad784c2d660337b22871
(cherry picked from commit fac74d319e54388b0fe3dcca82fb4c1af1a2f6d4)
diff --git a/juno_utils.sh b/juno_utils.sh
index 744baad..476a6fd 100644
--- a/juno_utils.sh
+++ b/juno_utils.sh
@@ -8,8 +8,8 @@
set -u
# Pre-built SCP/MCP binaries
-scp_bl1_url="$scp_mcp_downloads/juno/release/juno-bl1-bypass.bin"
-scp_bl2_url="$scp_mcp_downloads/juno/release/juno-bl2.bin"
+scp_bl1_url="$scp_mcp_downloads/juno/platform_variant_BOARD/release/juno-bl1-bypass.bin"
+scp_bl2_url="$scp_mcp_downloads/juno/platform_variant_BOARD/release/juno-bl2.bin"
psci_reset2_scp_bl2_url="$tfa_downloads/psci_reset2/scp_bl2.bin"
uboot_bl33_url="$linaro_release/juno-latest-oe-uboot/SOFTWARE/bl33-uboot.bin"
diff --git a/run_config/fvp-fip.tc b/run_config/fvp-fip.tc
index 9c22ee9..896fbab 100644
--- a/run_config/fvp-fip.tc
+++ b/run_config/fvp-fip.tc
@@ -11,7 +11,7 @@
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_downloads/tc$plat_variant/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+ url="$scp_mcp_downloads/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
archive_file "scp_ram.bin"
fi
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 12bcc39..d9a0af7 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -13,7 +13,7 @@
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_rom.bin" ]; then
# Pick the appropriate binary based on target platform variant
- url="$scp_mcp_downloads/tc$plat_variant/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
+ url="$scp_mcp_downloads/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
archive_file "scp_rom.bin"
fi
diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 1ce639a..102ca80 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -9,7 +9,7 @@
post_tf_build() {
if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_downloads/tc$plat_variant/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+ url="$scp_mcp_downloads/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
archive_file "scp_ram.bin"
fi
@@ -20,7 +20,7 @@
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_rom.bin" ]; then
# Pick the appropriate binary based on target platform variant
- url="$scp_mcp_downloads/tc$plat_variant/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
+ url="$scp_mcp_downloads/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
archive_file "scp_rom.bin"
fi
diff --git a/utils.sh b/utils.sh
index 243dc01..6d3fdd8 100644
--- a/utils.sh
+++ b/utils.sh
@@ -580,7 +580,7 @@
css_downloads="${css_downloads:-$tfa_downloads/css}"
# SCP/MCP release binaries.
-scp_mcp_downloads="${scp_mcp_downloads:-$tfa_downloads/css_scp_2.12.0}"
+scp_mcp_downloads="${scp_mcp_downloads:-$tfa_downloads/css_scp_2.13.0}"
linaro_2001_release="${linaro_2001_release:-$tfa_downloads/linaro/20.01}"
linaro_release="${linaro_release:-$linaro_2001_release}"