morello: Reintroduce tf-l3 and scp boot tests
Commit 973e6636b893ebb14c9ef9323fe45e942ec09796 disabled
Platform CI tests for Morello because of a major change
in the boot flow.
Update Morello run/build/model scripts to adhere to the
newly introduced TBBR based boot flow, and re-enable the
boot tests.
Signed-off-by: Anurag Koul <anurag.koul@arm.com>
Change-Id: Ib4646e48395e2a6293e4f8bbcf4b85c1b85e7000
diff --git a/script/build_package.sh b/script/build_package.sh
index 8f3a61a..80b58b6 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -179,21 +179,15 @@
for file; do
ext="$(echo $file | awk -F. "{print \$NF}")"
case $file in
- */firmware-scp_ramfw/bin/*)
+ */firmware-scp_ramfw/bin/*|*/firmware-scp_ramfw_fvp/bin/*)
cp $file $to/scp_ram.$ext
;;
- */firmware-scp_ramfw_fvp/bin/*)
- cp $file $to/scp_ramfw_fvp.$ext
- ;;
*/firmware-scp_romfw/bin/*)
cp $file $to/scp_rom.$ext
;;
- */firmware-mcp_ramfw/bin/*)
+ */firmware-mcp_ramfw/bin/*|*/firmware-mcp_ramfw_fvp/bin/*)
cp $file $to/mcp_ram.$ext
;;
- */firmware-mcp_ramfw_fvp/bin/*)
- cp $file $to/mcp_ramfw_fvp.$ext
- ;;
*/firmware-mcp_romfw/bin/*)
cp $file $to/mcp_rom.$ext
;;
diff --git a/script/trusted-firmware.nomination.py b/script/trusted-firmware.nomination.py
index 8c3738f..eb054f4 100644
--- a/script/trusted-firmware.nomination.py
+++ b/script/trusted-firmware.nomination.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -85,7 +85,6 @@
"tf-l2-coverity-misra-nominated/fvp-aarch64-sdei:coverity-tf-misra.diff"],
# Run Morello FVP busybox boot test for any platform changes
- # Disabling Morello boot tests until Morello TBBR changes are landed in TF-A
- #"path:plat/arm/board/morello":
- # ["tf-l3-boot-tests-css/fvp-morello-default:fvp-linux.morello-fip.morello-morello-debug"],
+ "path:plat/arm/board/morello":
+ ["tf-l3-boot-tests-css/fvp-morello-tbb:fvp-linux.morello-fip.morello-morello-debug"],
}