tc: Update scp_revision to ac2b4f1 for TC3
The SCP BL1 image is a pre-built, signed image for the
tests on the TC platform. Also use the corresponding
pre-built SCP BL2 image in the tests.
Change-Id: Ia85f94ddfd0134179ff170a53794d7b8514556bf
Signed-off-by: David Vincze <david.vincze@arm.com>
diff --git a/run_config/fvp-fip.tc b/run_config/fvp-fip.tc
index 88e67ac..d22b010 100644
--- a/run_config/fvp-fip.tc
+++ b/run_config/fvp-fip.tc
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -9,17 +9,17 @@
url="$tc_prebuilts/u-boot.bin" fetch_file
archive_file "u-boot.bin"
- # Use SCP binary from SCP build if it exists, or fetch pre-built ones.
- if [ ! -f "$archive/scp_ram.bin" ]; then
- if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
- if [ $plat_variant -eq 2 ]; then
+ if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
+ if [ $plat_variant -eq 2 ]; then
+ # 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/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
- elif [ $plat_variant -eq 3 ]; then
- url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
fi
-
- archive_file "scp_ram.bin"
+ elif [ $plat_variant -eq 3 ]; then
+ # Use pre-built SCP BL2 binary
+ url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
fi
+ archive_file "scp_ram.bin"
fi
if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 4d524a2..803bbdb 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -8,15 +8,17 @@
source "$ci_root/run_config/tc_rse_utils.sh"
post_tf_build() {
- if [ ! -f "$archive/scp_ram.bin" ]; then
- if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
- if [ $plat_variant -eq 2 ]; then
+ if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
+ if [ $plat_variant -eq 2 ]; then
+ # 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/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
- elif [ $plat_variant -eq 3 ]; then
- url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
fi
- archive_file "scp_ram.bin"
+ elif [ $plat_variant -eq 3 ]; then
+ # Use pre-built SCP BL2 binary
+ url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
fi
+ archive_file "scp_ram.bin"
fi
if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
diff --git a/tc_utils.sh b/tc_utils.sh
index b5441bc..3ab33b6 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -29,6 +29,7 @@
rse_revision="4ab7a20d"
elif [ $plat_variant -eq 3 ]; then
rse_revision="2fe1f7e"
+ scp_revision="ac2b4f1"
elif [ $plat_variant -eq 4 ]; then
rse_revision="213c553bf"
fi