chore: remove RD-E1-Edge model support
This platform has been deprecated, so we now maintain build-only support
for it. This change removes RD-E1-Edge support from both the Open-CI and
the internal CI.
Change-Id: Ieb4676c59b44779e0710b4b70dbfd0a632693aaf
Signed-off-by: Chris Kay <chris.kay@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 888d9a2..f4bb71c 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -58,7 +58,6 @@
# CSS model list
fvp_morello="fvp:fvp_morello_0.11_33;/opt/model/FVP_Morello/models/Linux64_GCC-6.4"
-fvp_rd_e1_edge="fvp:fvp_rd_e1_edge_${model_version}_${model_build};/opt/model/FVP_RD_E1_edge/models/${model_flavour}"
fvp_rd_n1_edge="fvp:fvp_rd_n1_edge_${model_version}_${model_build};/opt/model/FVP_RD_N1_edge/models/${model_flavour}"
fvp_rd_v1="fvp:fvp_rd_v1_${model_version}_${model_build};/opt/model/FVP_RD_V1/models/${model_flavour}"
fvp_tc1="fvp:fvp_tc1_${model_version}_${model_build};/opt/model/FVP_TC1/models/${model_flavour}"
@@ -110,7 +109,6 @@
[neoverse_n2]="${fvp_arm_std_library_11_16};FVP_Base_Neoverse-N1x4"
[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
[morello]="${fvp_morello};FVP_Morello"
-[css-rde1edge]="${fvp_rd_e1_edge};FVP_RD_E1_edge"
[css-rdn1edgex2]="${fvp_rd_n1_edge};FVP_RD_N1_edge_dual"
[css-rdv1]="${fvp_rd_v1};FVP_RD_V1"
[tc1]="${fvp_tc1};FVP_TC1"
diff --git a/group/tf-l1-build-fvp/fvp-rde1edge-tbb:nil b/group/tf-l1-build-fvp/fvp-rde1edge-tbb:nil
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-build-fvp/fvp-rde1edge-tbb:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-coverity-misra-nominated/fvp-rde1edge-tbb:coverity-tf-misra.diff b/group/tf-l2-coverity-misra-nominated/fvp-rde1edge-tbb:coverity-tf-misra.diff
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l2-coverity-misra-nominated/fvp-rde1edge-tbb:coverity-tf-misra.diff
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-error-deprecated/fvp-rde1edge-error-deprecated:nil b/group/tf-l2-error-deprecated/fvp-rde1edge-error-deprecated:nil
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l2-error-deprecated/fvp-rde1edge-error-deprecated: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-rde1edge.sh b/model/css-rde1edge.sh
deleted file mode 100644
index 580f1f3..0000000
--- a/model/css-rde1edge.sh
+++ /dev/null
@@ -1,37 +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.17/29/models/$model_flavour/FVP_RD_E1_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 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.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
-EOF
diff --git a/rde1edge_utils.sh b/rde1edge_utils.sh
deleted file mode 100644
index ba0b416..0000000
--- a/rde1edge_utils.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-source "$ci_root/fvp_utils.sh"
-
-sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rde1edge}"
-
-kernel_list[sgi-busybox]="$sgi_prebuilts/Image"
-initrd_list[sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
-
-scp_ram_addr=0x0bd80000
-mcp_ram_addr=0x0be00000
diff --git a/run_config/fvp-rde1edge b/run_config/fvp-rde1edge
deleted file mode 100644
index 716d907..0000000
--- a/run_config/fvp-rde1edge
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
- url="$sgi_prebuilts/mcp-rom.bin" fetch_file
- url="$sgi_prebuilts/scp-ram.bin" fetch_file
- url="$sgi_prebuilts/scp-rom.bin" fetch_file
-
- archive_file "mcp-rom.bin"
- archive_file "scp-ram.bin"
- archive_file "scp-rom.bin"
-}
-
-generate_lava_job() {
- local model="css-rde1edge"
-
- uart="0" set_expect_variable "num_cpus" "32"
-
- set_run_env "ports_script" "$ci_root/model/css-sgi575-ports.awk"
- set_run_env "num_uarts" "2"
-
- model="css-rde1edge" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/tf_config/fvp-rde1edge-error-deprecated b/tf_config/fvp-rde1edge-error-deprecated
deleted file mode 100644
index f002e3b..0000000
--- a/tf_config/fvp-rde1edge-error-deprecated
+++ /dev/null
@@ -1,3 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-ERROR_DEPRECATED=1
-PLAT=rde1edge
diff --git a/tf_config/fvp-rde1edge-tbb b/tf_config/fvp-rde1edge-tbb
deleted file mode 100644
index 9c99784..0000000
--- a/tf_config/fvp-rde1edge-tbb
+++ /dev/null
@@ -1,7 +0,0 @@
-ARM_ROTPK_LOCATION=devel_rsa
-CREATE_KEYS=1
-CROSS_COMPILE=aarch64-none-elf-
-GENERATE_COT=1
-PLAT=rde1edge
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-rde1edge-tbb-dualroot b/tf_config/fvp-rde1edge-tbb-dualroot
deleted file mode 100644
index f2e7db2..0000000
--- a/tf_config/fvp-rde1edge-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=rde1edge
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-TRUSTED_BOARD_BOOT=1