fvp: remove RD-V1 runconfig from CI
With new FVP release 11.28 RD-V1 model is no longer available.
Remove RD-V1 runconfig from CI, but RD-V1 platfrom build in l1
config is still retained.
Change-Id: Ice7be6e6e7131a407035c0013d5a18a56ba2d71f
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index c9ad1bd..550c9e0 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -55,7 +55,6 @@
# CSS model list
fvp_morello="fvp:fvp_morello_0.11_33;/opt/model/FVP_Morello/models/Linux64_GCC-6.4"
-fvp_rd_v1="fvp:fvp_rd_v1_11.26_11;/opt/model/FVP_RD_V1/models/${model_flavour}"
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
@@ -98,7 +97,6 @@
[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"
-[css-rdv1]="${fvp_rd_v1};FVP_RD_V1"
[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-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov
deleted file mode 100644
index 892d94a..0000000
--- a/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug b/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug
deleted file mode 100644
index 892d94a..0000000
--- a/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug b/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug
deleted file mode 100644
index 892d94a..0000000
--- a/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/model/css-rdv1.sh b/model/css-rdv1.sh
deleted file mode 100644
index 83d2d0a..0000000
--- a/model/css-rdv1.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_RD_V1"
-
-cat <<EOF >"$model_param_file"
--C css.scp.terminal_uart_aon.start_port=5000
--C css.mcp.terminal_uart0.start_port=5001
--C css.mcp.terminal_uart1.start_port=5002
--C css.terminal_uart_ap.start_port=5003
--C css.terminal_uart1_ap.start_port=5004
--C soc.terminal_s0.start_port=5005
--C soc.terminal_s1.start_port=5006
--C soc.terminal_mcp.start_port=5007
--C board.terminal_0.start_port=5008
--C board.terminal_1.start_port=5009
-
--C board.flashloader0.fname=$fip_bin
--C board.virtioblockdevice.image_path=$busybox_bin
--C css.cmn_650.force_rnsam_internal=true
--C css.cmn_650.mesh_config_file=cmn650_rdv1.yml
--C css.gic_distributor.ITS-device-bits=20
--C css.mcp.ROMloader.fname=$mcp_rom_bin
--C css.pl011_uart_ap.unbuffered_output=1
--C css.pl011_uart1_ap.unbuffered_output=1
--C css.scp.pl011_uart_scp.unbuffered_output=1
--C css.scp.ROMloader.fname=$scp_rom_bin
--C css.trustedBootROMloader.fname=$bl1_bin
--C soc.pl011_uart_mcp.unbuffered_output=1
--C soc.pl011_uart0.enable_dc4=0
--C soc.pl011_uart0.flow_ctrl_mask_en=1
--C soc.pl011_uart0.unbuffered_output=1
--C soc.pl011_uart1.unbuffered_output=1
---data css.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
---data css.mcp.armcortexm7ct=$mcp_ram_bin@$mcp_ram_addr
-EOF
diff --git a/rdv1_utils.sh b/rdv1_utils.sh
deleted file mode 100644
index fe137d7..0000000
--- a/rdv1_utils.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-source "$ci_root/fvp_utils.sh"
-
-nrd_prebuilts="${nrd_prebuilts:-$tfa_downloads/neoverse_rd/rdv1}"
-
-# Pre-built SCP/MCP binaries
-scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/neoverse-rd/rdv1/release}"
-
-
-kernel_list[nrd-busybox]="$nrd_prebuilts/Image"
-initrd_list[nrd-ramdisk]="$nrd_prebuilts/ramdisk-busybox.img"
-
-scp_ram_addr=0x0bd80000
-mcp_ram_addr=0x0BF80000
diff --git a/run_config/fvp-rdv1 b/run_config/fvp-rdv1
deleted file mode 100644
index c462303..0000000
--- a/run_config/fvp-rdv1
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
- # Fetch the pre-built SCP/MCP binaries if they haven't been built
- if [ ! -f "$archive/mcp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/rdv1-mcp-bl2.bin" saveas="mcp_ram.bin" fetch_file
- archive_file "mcp_ram.bin"
- fi
- if [ ! -f "$archive/mcp_rom.bin" ]; then
- url="$scp_mcp_prebuilts/rdv1-mcp-bl1.bin" saveas="mcp_rom.bin" fetch_file
- archive_file "mcp_rom.bin"
- fi
- if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_mcp_prebuilts/rdv1-bl2.bin" saveas="scp_ram.bin" fetch_file
- archive_file "scp_ram.bin"
- fi
- if [ ! -f "$archive/scp_rom.bin" ]; then
- url="$scp_mcp_prebuilts/rdv1-bl1.bin" saveas="scp_rom.bin" fetch_file
- archive_file "scp_rom.bin"
- fi
-}
-
-generate_lava_job() {
- local model="css-rdv1"
-
- uart="1" set_expect_variable "num_cpus" "16"
-
- # Hold terminal_uart_aon
- uart="2" file="hold_uart.exp" track_expect
-
- set_run_env "ports_script" "$ci_root/model/css-sgi575-ports.awk"
- set_run_env "num_uarts" "3"
-
- model="$model" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/scp_config/fvp-rdv1 b/scp_config/fvp-rdv1
deleted file mode 100644
index 0e34979..0000000
--- a/scp_config/fvp-rdv1
+++ /dev/null
@@ -1,4 +0,0 @@
-PRODUCT=neoverse-rd/rdv1
-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++
\ No newline at end of file
diff --git a/script/trusted-firmware.nomination.py b/script/trusted-firmware.nomination.py
index 1f4ebd5..2829774 100644
--- a/script/trusted-firmware.nomination.py
+++ b/script/trusted-firmware.nomination.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -17,11 +17,6 @@
"tf-l3-boot-tests-css/fvp-rdn1edgex2-tbb:fvp-linux.nrd-fip.nrd-rdn1edgex2-debug",
"tf-l2-coverity-misra-nominated/fvp-rdn1edgex2-tbb:coverity-tf-misra.diff"],
- # Run RD-V1 TF-A Tests and MISRA checks for any platform changes
- "path:plat/arm/board/neoverse_rd/platform/rdv1":
- ["tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug",
- "tf-l2-coverity-misra-nominated/fvp-rdv1-tbb:coverity-tf-misra.diff"],
-
# Run SGI575 boot test, TF-A Tests and MISRA checks for any changes with "neoverse_rd" in the path
"pathre:neoverse_rd":
["tf-l3-boot-tests-css/fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug",