refactor(ci): use the copies of tools in the BUILD directory
Since tf-a patch cbd6cec3c, all tools are available from the BUILD
directory. Use that copy instead of the symlink in the generic place.
This makes parallel builds work correctly.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: Iad2eca53d5b2c3c5fdd4b9c032bdb1f557c2f04a
diff --git a/n1sdp_utils.sh b/n1sdp_utils.sh
index e79c3f2..cb486a7 100644
--- a/n1sdp_utils.sh
+++ b/n1sdp_utils.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021-2023 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -42,6 +42,7 @@
scp_uuid="cfacc2c4-15e8-4668-82be-430a38fad705"
mcp_uuid="54464222-a4cf-4bf8-b1b6-cee7dade539e"
+ fiptool=$(fiptool_path)
# Create FIP for SCP
"$fiptool" create --blob \
uuid=$scp_uuid,file=$tf_build_root/n1sdp/$bin_mode/bl1.bin \
diff --git a/run_config/tc_rse_utils.sh b/run_config/tc_rse_utils.sh
index f464725..4c9e463 100644
--- a/run_config/tc_rse_utils.sh
+++ b/run_config/tc_rse_utils.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2023-2024, Arm Limited. All rights reserved.
+# Copyright (c) 2023-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -86,6 +86,7 @@
archive_file "signed_scp_romfw.bin"
# Create FIP layout
+ fiptool=$(fiptool_path)
"$fiptool" update \
--align 8192 --rse-bl2 "$archive/rse_bl2_signed.bin" \
--align 8192 --rse-scp-bl1 "$archive/signed_scp_romfw.bin" \
diff --git a/script/build_package.sh b/script/build_package.sh
index 825e76e..0bf07e0 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -38,8 +38,14 @@
export archive="$artefacts"
build_log="$artefacts/build.log"
-fiptool="$tf_root/tools/fiptool/fiptool"
-cert_create="$tf_root/tools/cert_create/cert_create"
+
+fiptool_path() {
+ echo $tf_build_root/$(get_tf_opt PLAT)/${bin_mode}/tools/fiptool/fiptool
+}
+
+cert_create_path() {
+ echo $tf_build_root/$(get_tf_opt PLAT)/${bin_mode}/tools/cert_create/cert_create
+}
# Validate $bin_mode
case "$bin_mode" in
@@ -268,6 +274,7 @@
fip="$(basename "$1")"
fi
+ fiptool=$(fiptool_path)
"$fiptool" unpack "$fip"
echo "Extracted FIP: $fip"
}
@@ -336,6 +343,7 @@
}
fip_update() {
+ fiptool=$(fiptool_path)
# Before the update process, check if the given image is supported by
# the fiptool. It's assumed that both fiptool and cert_create move in
# tandem, and therefore, if one has support, the other has it too.
@@ -417,6 +425,7 @@
done
# Create certificates
+ cert_create=$(cert_create_path)
"$cert_create" $cert_args $common_args &>>"$build_log"
# Recreate and archive FIP