refactor(juno): streamline SCP binary copying
For Juno we need to copy the latest SCP BL1 binary into the recovery
image, which has to match the SCP BL2 we put into the TF-A FIP image.
However there is no need to copy that scp_bl2.bin into the recovery
image, it's just in the original recovery image for convenience reasons
(to allow simpler rebuilds). So drop this explicit copy from when we
re-generate the recovery image.
Also drop the redundant get_scp_bl_bin() function, we can just use
fetch_file() for that.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Change-Id: I4b3df2b99d36215cd1e6e3eb1024f43e67896f44
diff --git a/juno_utils.sh b/juno_utils.sh
index aea73c7..421d997 100644
--- a/juno_utils.sh
+++ b/juno_utils.sh
@@ -34,12 +34,6 @@
popd
}
-# Get scp_bl1 and scp_bl2 binaries
-# from $url and store as $saveas
-get_scp_bl_bin() {
- url="$url" saveas="$saveas" fetch_file
-}
-
get_scp_bl2_bin() {
url="$scp_bl2_url" saveas="scp_bl2.bin" fetch_file
archive_file "scp_bl2.bin"
@@ -80,10 +74,9 @@
saveas="$zip_dir" url="$url" fetch_directory
if [ "$*" ]; then
- # Copy scp_bl1 scp_bl2 binaries. Copying then first
- # so that the subsequent copy can replace it if necessary.
- url="$scp_bl1_url" saveas="$zip_dir/SOFTWARE/scp_bl1.bin" get_scp_bl_bin
- url="$scp_bl2_url" saveas="$zip_dir/SOFTWARE/scp_bl2.bin" get_scp_bl_bin
+ # Replace files needed for this test. Copying them first so
+ # that the subsequent copy can replace it if necessary.
+ url="$scp_bl1_url" saveas="$zip_dir/SOFTWARE/scp_bl1.bin" fetch_file
cp -f "$@" "$zip_dir/SOFTWARE"
fi