group/tf-l3-boot-tests-css: Add boot test config for Morello
Add support to fetch the SCP and MCP binaries
from the prebuilts and add boot test config for
Morello FVP platform in group/tf-l3-boot-tests-css.
Also, the grub-busybox.img file has been renamed as busybox.img
in the latest software stack for Morello Platform.
Signed-off-by: Chandni Cherukuri <chandni.cherukuri@arm.com>
Change-Id: I8d1533c72c64f9eb5e82c95123a5edda7fa733f7
diff --git a/group/tf-l3-boot-tests-css/fvp-morello-default:fvp-linux.morello-fip.morello-morello-debug b/group/tf-l3-boot-tests-css/fvp-morello-default:fvp-linux.morello-fip.morello-morello-debug
new file mode 100644
index 0000000..aa57540
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-morello-default:fvp-linux.morello-fip.morello-morello-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2021, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/run_config/fvp-fip.morello b/run_config/fvp-fip.morello
index 29e6c79..302f71a 100644
--- a/run_config/fvp-fip.morello
+++ b/run_config/fvp-fip.morello
@@ -5,6 +5,26 @@
# SPDX-License-Identifier: BSD-3-Clause
#
post_tf_build() {
+ #Fetch pre-built SCP/MCP binaries if they haven't been built
+ if [ ! -f "$archive/mcp_rom.bin" ]; then
+ url="$morello_prebuilts/mcp_rom.bin" fetch_file
+ archive_file "mcp_rom.bin"
+ fi
+
+ if [ ! -f "$archive/scp_rom.bin" ]; then
+ url="$morello_prebuilts/scp_rom.bin" fetch_file
+ archive_file "scp_rom.bin"
+ fi
+
+ if [ ! -f "$archive/scp_ramfw_fvp.bin" ]; then
+ url="$morello_prebuilts/scp_ramfw_fvp.bin" fetch_file
+ archive_file "scp_ramfw_fvp.bin"
+ fi
+
+ if [ ! -f "$archive/mcp_ramfw_fvp.bin" ]; then
+ url="$morello_prebuilts/mcp_ramfw_fvp.bin" fetch_file
+ archive_file "mcp_ramfw_fvp.bin"
+ fi
# Create FIP for SCP
"$fiptool" create --soc-fw "$tf_root/build/morello/$bin_mode/bl31.bin" --scp-fw "$archive/scp_ramfw_fvp.bin" "scp_fw.bin"
diff --git a/run_config/fvp-linux.morello b/run_config/fvp-linux.morello
index 8534b07..be3cf6d 100644
--- a/run_config/fvp-linux.morello
+++ b/run_config/fvp-linux.morello
@@ -8,7 +8,7 @@
fetch_tf_resource() {
uart="1" set_primary="1" file="linux-rd-busybox.exp" track_expect
- url="$morello_prebuilts/grub-busybox.img" saveas="busybox.bin" fetch_file
+ url="$morello_prebuilts/busybox.img" saveas="busybox.bin" fetch_file
archive_file "busybox.bin"