fvp: remove morello runconfig from CI
Morello model binaries are not available with newer FVP release 11.28
So remove reference and usage with older FVP's.
Change-Id: I595f8d28215eff897f951094919e0a1fc464bc56
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 550c9e0..99a327c 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -54,7 +54,6 @@
fvp_rd_1_ae="fvp:fvp_rd_1_ae_${model_version}_${model_build};/opt/model/FVP_RD_1_AE/models/${model_flavour}"
# CSS model list
-fvp_morello="fvp:fvp_morello_0.11_33;/opt/model/FVP_Morello/models/Linux64_GCC-6.4"
fvp_tc4="fvp:fvp_tc4_${model_version}_${model_build};/opt/model/FVP_TC4/models/${model_flavour}"
# FVP associate array, run_config are keys and fvp container parameters are the values
@@ -96,7 +95,6 @@
[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
[neoverse_n2]="${fvp_arm_std_library};FVP_Base_Neoverse-N2"
[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
-[morello]="${fvp_morello};FVP_Morello"
[tc4]="${fvp_tc4};FVP_TC4"
[baser-aemv8r]="${fvp_base_aemv8r};FVP_BaseR_AEMv8R"
[rd1ae]="${fvp_rd_1_ae};FVP_RD_1_AE"
diff --git a/group/scp-boot-tests/fvp-morello,fvp-morello-tbb:fvp-linux.morello-fip.morello-morello-debug b/group/scp-boot-tests/fvp-morello,fvp-morello-tbb:fvp-linux.morello-fip.morello-morello-debug
deleted file mode 100644
index 0849ee7..0000000
--- a/group/scp-boot-tests/fvp-morello,fvp-morello-tbb:fvp-linux.morello-fip.morello-morello-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l3-boot-tests-css/fvp-morello-tbb:fvp-linux.morello-fip.morello-morello-debug b/group/tf-l3-boot-tests-css/fvp-morello-tbb:fvp-linux.morello-fip.morello-morello-debug
deleted file mode 100644
index b8939c8..0000000
--- a/group/tf-l3-boot-tests-css/fvp-morello-tbb:fvp-linux.morello-fip.morello-morello-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/morello_utils.sh b/morello_utils.sh
deleted file mode 100644
index 2a60327..0000000
--- a/morello_utils.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-source "$ci_root/fvp_utils.sh"
-
-morello_prebuilts=${morello_prebuilts:="$tfa_downloads/morello"}
-scp_mcp_prebuilts=${scp_mcp_prebuilts:="$scp_mcp_downloads/morello/release"}
-
-uefi_addr=0x14200000
diff --git a/run_config/fvp-fip.morello b/run_config/fvp-fip.morello
deleted file mode 100644
index 60090c2..0000000
--- a/run_config/fvp-fip.morello
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-2023 Arm Limited. All rights reserved.
-#
-# 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="$scp_mcp_prebuilts/morello-mcp-bl1.bin" saveas="mcp_rom.bin" fetch_file
- archive_file "mcp_rom.bin"
- fi
-
- if [ ! -f "$archive/scp_rom.bin" ]; then
- url="$scp_mcp_prebuilts/morello-bl1.bin" saveas="scp_rom.bin" fetch_file
- archive_file "scp_rom.bin"
- fi
-
- if [ ! -f "$archive/mcp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/morello-fvp-mcp-bl2.bin" saveas="mcp_ram.bin" fetch_file
- archive_file "mcp_ram.bin"
- fi
-
- if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/morello-fvp-bl2.bin" saveas="scp_ram.bin" fetch_file
- archive_file "scp_ram.bin"
- fi
-
- # Create FIP layout for SCP
- "$fiptool" create --scp-fw "$archive/scp_ram.bin" "scp_fw.bin"
- archive_file "scp_fw.bin"
-
- # Create FIP layout for MCP, this needs fixed uuid for now
- "$fiptool" create --blob uuid=54464222-a4cf-4bf8-b1b6-cee7dade539e,file="$archive/mcp_ram.bin" "mcp_fw.bin"
- archive_file "mcp_fw.bin"
-
- # Fetch BL33 [uefi.bin] for Morello
- url="$morello_prebuilts/uefi.bin" filename="uefi.bin" fetch_and_archive
-
- # Create FIP for BL2, BL31, and BL33
- build_fip BL31="$bl31" BL2="$bl2" BL33="$archive/uefi.bin"
-}
diff --git a/run_config/fvp-morello b/run_config/fvp-morello
deleted file mode 100644
index 452d811..0000000
--- a/run_config/fvp-morello
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="morello"
-
- uart="1" set_expect_variable "skip_early_boot_msgs" "1"
- uart="1" set_expect_variable "num_cpus" "4"
-
- # Hold terminal_uart_aon (SCP terminal)
- uart="2" file="hold_uart.exp" track_expect
-
- set_run_env "ports_script" "$ci_root/model/morello-ports.awk"
- set_run_env "num_uarts" "3"
-
- model="morello" \
- model_build="33" \
- model_flavour="Linux64_GCC-6.4" \
- model_version="0.11" \
- gen_model_params
-
- model="$model" gen_fvp_yaml
-}
diff --git a/scp_config/fvp-morello b/scp_config/fvp-morello
deleted file mode 100644
index 6431503..0000000
--- a/scp_config/fvp-morello
+++ /dev/null
@@ -1,5 +0,0 @@
-PRODUCT=morello
-EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
-EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=INFO
diff --git a/script/trusted-firmware.nomination.py b/script/trusted-firmware.nomination.py
index 2829774..6fe943a 100644
--- a/script/trusted-firmware.nomination.py
+++ b/script/trusted-firmware.nomination.py
@@ -74,8 +74,4 @@
"has:EL3_EXCEPTION_HANDLING"):
["tftf-l2-fvp/fvp-aarch64-sdei,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug",
"tf-l2-coverity-misra-nominated/fvp-aarch64-sdei:coverity-tf-misra.diff"],
-
- # Run Morello FVP busybox boot test for any platform changes
- "path:plat/arm/board/morello":
- ["tf-l3-boot-tests-css/fvp-morello-tbb:fvp-linux.morello-fip.morello-morello-debug"],
}