feat(neoverse_rd): deprecate and remove RD-N1-Edge platform variants
deprecate and remove support for RD-N1-Edge and RD-N1-Edgex2 platform
variants.
Signed-off-by: Rohit Mathew <rohit.mathew@arm.com>
Change-Id: I51983ca4bc14255e95b47b9e59086df567c2ca8c
diff --git a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug-bmcov
deleted file mode 100644
index 892d94a..0000000
--- a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-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-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug b/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug
deleted file mode 100644
index 52bfb1d..0000000
--- a/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2024 Arm Limited and Contributors. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-fvp/fvp-rdn1edgex2-tbb:nil b/group/tf-l1-build-fvp/fvp-rdn1edgex2-tbb:nil
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l1-build-fvp/fvp-rdn1edgex2-tbb:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/model/css-rdinfra-ports.awk b/model/css-rdinfra-ports.awk
deleted file mode 100644
index 4829a76..0000000
--- a/model/css-rdinfra-ports.awk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-/terminal_uart1_ap/ { ports[0] = $NF }
-/terminal_uart_ap/ { ports[1] = $NF }
-
-# SCP uart window title
-/terminal_uart_aon/ { uart_aon[$NF]++ }
-
-END {
- # start with idx 2, port idx 0 and 1 are taken by s0 and s1
- uart_aon_idx = 2;
- for (port in uart_aon) {
- ports[uart_aon_idx++] = port;
- }
-
- for (i = 0; i < num_uarts; i++) {
- if (ports[i] != "")
- print "ports[" i "]=" ports[i]
- }
-}
diff --git a/model/css-rdn1edge.sh b/model/css-rdn1edge.sh
deleted file mode 100644
index fde5089..0000000
--- a/model/css-rdn1edge.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_N1_edge"
-
-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.cmn600.force_rnsam_internal=false
--C css.cmn600.mesh_config_file=RD_N1_E1_cmn600.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_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@0x0BF80000
-EOF
diff --git a/model/css-rdn1edgex2.sh b/model/css-rdn1edgex2.sh
deleted file mode 100644
index 9fdfe38..0000000
--- a/model/css-rdn1edgex2.sh
+++ /dev/null
@@ -1,63 +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/11.17/33/models/$model_flavour/FVP_RD_N1_edge_dual"
-
-cat <<EOF >"$model_param_file"
--C css0.scp.terminal_uart_aon.start_port=5000
--C css0.mcp.terminal_uart0.start_port=5001
--C css0.mcp.terminal_uart1.start_port=5002
--C css0.terminal_uart_ap.start_port=5003
--C css0.terminal_uart1_ap.start_port=5004
--C css1.scp.terminal_uart_aon.start_port=5005
--C css1.mcp.terminal_uart0.start_port=5006
--C css1.mcp.terminal_uart1.start_port=5007
--C css1.terminal_uart_ap.start_port=5008
--C css1.terminal_uart1_ap.start_port=5009
--C soc0.terminal_s0.start_port=5010
--C soc0.terminal_s1.start_port=5011
--C soc0.terminal_mcp.start_port=5012
--C board0.terminal_0.start_port=5013
--C board0.terminal_1.start_port=5014
--C soc1.terminal_s0.start_port=5015
--C soc1.terminal_s1.start_port=5016
--C soc1.terminal_mcp.start_port=5017
--C board1.terminal_0.start_port=5018
--C board1.terminal_1.start_port=5019
-
--C board0.flashloader0.fname=$fip_bin
--C board0.virtioblockdevice.image_path=$busybox_bin
--C css0.cmn600.force_rnsam_internal=false
--C css0.cmn600.mesh_config_file=RD_N1_E1_cmn600.yml
--C css0.gic_distributor.ITS-device-bits=20
--C css0.gic_distributor.multichip-threaded-dgi=0
--C css0.mcp.ROMloader.fname=$mcp_rom_bin
--C css0.pl011_uart_ap.unbuffered_output=1
--C css0.scp.pl011_uart_scp.unbuffered_output=1
--C css0.scp.ROMloader.fname=$scp_rom_bin
--C css0.trustedBootROMloader.fname=$bl1_bin
--C css1.cmn600.force_rnsam_internal=false
--C css1.cmn600.mesh_config_file=RD_N1_E1_cmn600.yml
--C css1.gic_distributor.ITS-device-bits=20
--C css1.gic_distributor.multichip-threaded-dgi=0
--C css1.mcp.ROMloader.fname=$mcp_rom_bin
--C css1.pl011_uart_ap.unbuffered_output=1
--C css1.scp.pl011_uart_scp.unbuffered_output=1
--C css1.scp.ROMloader.fname=$scp_rom_bin
--C css1.trustedBootROMloader.fname=$bl1_bin
--C soc0.pl011_uart_mcp.unbuffered_output=1
--C soc0.pl011_uart0.enable_dc4=0
--C soc0.pl011_uart0.flow_ctrl_mask_en=1
--C soc0.pl011_uart0.unbuffered_output=1
--C soc0.pl011_uart1.unbuffered_output=1
--C soc1.pl011_uart_mcp.unbuffered_output=1
--C soc1.pl011_uart0.unbuffered_output=1
--C soc1.pl011_uart1.unbuffered_output=1
-
---data css0.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
---data css1.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
-EOF
diff --git a/rdn1edge_utils.sh b/rdn1edge_utils.sh
deleted file mode 100644
index f0b06f2..0000000
--- a/rdn1edge_utils.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-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/rdn1edge}"
-
-# Pre-built SCP/MCP binaries
-scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/neoverse-rd/rdn1e1/release}"
-
-kernel_list[nrd-busybox]="$nrd_prebuilts/Image"
-initrd_list[nrd-ramdisk]="$nrd_prebuilts/ramdisk-busybox.img"
-
-scp_ram_addr=0x0bd80000
-mcp_ram_addr=0x0be00000
diff --git a/run_config/fvp-rdn1edge b/run_config/fvp-rdn1edge
deleted file mode 100644
index d7ee90c..0000000
--- a/run_config/fvp-rdn1edge
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-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/rdn1e1-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/rdn1e1-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/rdn1e1-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/rdn1e1-bl1.bin" saveas="scp_rom.bin" fetch_file
- archive_file "scp_rom.bin"
- fi
-}
-
-generate_lava_job() {
- local model="css-rdn1edge"
-
- # 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/run_config/fvp-rdn1edgex2 b/run_config/fvp-rdn1edgex2
deleted file mode 100644
index 1d5653f..0000000
--- a/run_config/fvp-rdn1edgex2
+++ /dev/null
@@ -1,50 +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_rom.bin" ]; then
- url="$scp_mcp_prebuilts/rdn1e1-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/rdn1e1-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/rdn1e1-bl1.bin" saveas="scp_rom.bin" fetch_file
- archive_file "scp_rom.bin"
- fi
-}
-
-pre_tf_build() {
- #
- # Dual-Chip RD-N1-Edge FVP has reliability issues with stlr instruction
- # while sending events across the chip through CCIX link. Apply 'send
- # explicit event after store release instruction' patch to improve the
- # reliability of cross chip events.
- #
- apply_tf_patch "css_rd_multichip_fvp/spinlock-send-explicit-event-after-store-release.patch"
-}
-
-generate_lava_job() {
- local model="css-rdn1edgex2"
-
- uart="1" set_expect_variable "num_cpus" "16"
-
- # Hold scp terminal_uart_aon on css0
- uart="2" file="hold_uart.exp" track_expect
-
- # Hold scp terminal_uart_aon on css1
- uart="3" file="hold_uart.exp" track_expect
-
- set_run_env "ports_script" "$ci_root/model/css-rdinfra-ports.awk"
- set_run_env "num_uarts" "4"
-
- model="$model" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/scp_config/fvp-rdn1edge b/scp_config/fvp-rdn1edge
deleted file mode 100644
index c14401b..0000000
--- a/scp_config/fvp-rdn1edge
+++ /dev/null
@@ -1,4 +0,0 @@
-PRODUCT=neoverse-rd/rdn1e1
-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/tf-coverity/coverity_tf_conf.py b/script/tf-coverity/coverity_tf_conf.py
index 00867ca..5c4ab95 100644
--- a/script/tf-coverity/coverity_tf_conf.py
+++ b/script/tf-coverity/coverity_tf_conf.py
@@ -93,13 +93,8 @@
("plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c", "Not currently used"),
("plat/imx/imx8m/imx8mq/imx8mq_psci.c", "Not currently used"),
- # Exclude the following files of RDN1EDGE and SGI575 as these platforms
+ # Exclude the following files of SGI575 as these platforms
# are deprecated and removed from the CI.
- ("plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_err.c", "Only used by deprecated RDN1EDGE platforms"),
- ("plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_plat.c", "Only used by deprecated RDN1EDGE platforms"),
- ("plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_security.c", "Only used by deprecated RDN1EDGE platforms"),
- ("plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_topology.c", "Only used by deprecated RDN1EDGE platforms"),
- ("plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_trusted_boot.c", "Only used by deprecated RDN1EDGE platforms"),
("plat/arm/board/neoverse_rd/platform/sgi575/sgi575_err.c", "Only used by deprecated SGI575 platform"),
("plat/arm/board/neoverse_rd/platform/sgi575/sgi575_plat.c", "Only used by deprecated SGI575 platform"),
("plat/arm/board/neoverse_rd/platform/sgi575/sgi575_security.c", "Only used by deprecated SGI575 platform"),
diff --git a/script/trusted-firmware.nomination.py b/script/trusted-firmware.nomination.py
index 6fe943a..de17089 100644
--- a/script/trusted-firmware.nomination.py
+++ b/script/trusted-firmware.nomination.py
@@ -10,13 +10,6 @@
# This file is EXECED from gen_nomination.py
nomination_rules = {
- # Run RDN1EDGE TF-A Tests and MISRA checks for any platform changes
- "path:plat/arm/board/neoverse_rd/platform/rdn1edge":
- ["tf-l3-boot-tests-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf.nrd-fip.tftf-rdn1edge",
- "tf-l2-coverity-misra-nominated/fvp-rdn1edge-tbb:coverity-tf-misra.diff",
- "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 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",
diff --git a/tf_config/fvp-rdn1edge-error-deprecated b/tf_config/fvp-rdn1edge-error-deprecated
deleted file mode 100644
index 330cd7f..0000000
--- a/tf_config/fvp-rdn1edge-error-deprecated
+++ /dev/null
@@ -1,3 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-ERROR_DEPRECATED=1
-PLAT=rdn1edge
diff --git a/tf_config/fvp-rdn1edge-tbb b/tf_config/fvp-rdn1edge-tbb
deleted file mode 100644
index d07bc7e..0000000
--- a/tf_config/fvp-rdn1edge-tbb
+++ /dev/null
@@ -1,7 +0,0 @@
-ARM_ROTPK_LOCATION=devel_rsa
-CREATE_KEYS=1
-CROSS_COMPILE=aarch64-none-elf-
-GENERATE_COT=1
-PLAT=rdn1edge
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-rdn1edge-tbb-dualroot b/tf_config/fvp-rdn1edge-tbb-dualroot
deleted file mode 100644
index 5cdf8e4..0000000
--- a/tf_config/fvp-rdn1edge-tbb-dualroot
+++ /dev/null
@@ -1,8 +0,0 @@
-ARM_ROTPK_LOCATION=devel_rsa
-COT=dualroot
-CREATE_KEYS=1
-CROSS_COMPILE=aarch64-none-elf-
-GENERATE_COT=1
-PLAT=rdn1edge
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-rdn1edgex2-tbb b/tf_config/fvp-rdn1edgex2-tbb
deleted file mode 100644
index 4d15046..0000000
--- a/tf_config/fvp-rdn1edgex2-tbb
+++ /dev/null
@@ -1,9 +0,0 @@
-ARM_ROTPK_LOCATION=devel_rsa
-CREATE_KEYS=1
-CROSS_COMPILE=aarch64-none-elf-
-GENERATE_COT=1
-NRD_CHIP_COUNT=2
-PLAT=rdn1edge
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-TRUSTED_BOARD_BOOT=1
-PLAT_UTILS=rdn1edgex2_utils
diff --git a/tftf_config/fvp-rdn1edge-default b/tftf_config/fvp-rdn1edge-default
deleted file mode 100644
index 0532d55..0000000
--- a/tftf_config/fvp-rdn1edge-default
+++ /dev/null
@@ -1,2 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=rdn1edge