tc: remove deprecate tc0 configs
And the associated files.
Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I3c2cb9ef2d5f7436c34a5a98b63f6b851cafff82
diff --git a/fvp_utils.sh b/fvp_utils.sh
index dd0ac8f..14c1e38 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -61,7 +61,6 @@
fvp_rd_e1_edge="fvp:fvp_rd_e1_edge_11.17_29;/opt/model/FVP_RD_E1_edge/models/${model_flavour}"
fvp_rd_n1_edge="fvp:fvp_rd_n1_edge_11.17_29;/opt/model/FVP_RD_N1_edge/models/${model_flavour}"
fvp_rd_v1="fvp:fvp_rd_v1_11.17_29;/opt/model/FVP_RD_V1/models/${model_flavour}"
-fvp_tc0="fvp:fvp_tc0_11.17_18;/opt/model/FVP_TC0/models/${model_flavour}"
fvp_tc1="fvp:fvp_tc1_11.17_33;/opt/model/FVP_TC1/models/${model_flavour}"
fvp_tc2="fvp:fvp_tc2_11.20_24;/opt/model/FVP_TC2/models/${model_flavour}"
@@ -114,7 +113,6 @@
[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"
-[tc0]="${fvp_tc0};FVP_TC0"
[tc1]="${fvp_tc1};FVP_TC1"
[tc2]="${fvp_tc2};FVP_TC2"
)
diff --git a/group/spm-l3-boot-tests/tc-default,fvp-tc0-spm,fvp-tc-spm:fvp-tc0.spm.tftf-debug b/group/spm-l3-boot-tests/tc-default,fvp-tc0-spm,fvp-tc-spm:fvp-tc0.spm.tftf-debug
deleted file mode 100644
index 33f3ae7..0000000
--- a/group/spm-l3-boot-tests/tc-default,fvp-tc0-spm,fvp-tc-spm:fvp-tc0.spm.tftf-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2021, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/fvp-tc0-tbb:nil b/group/tf-l1-build-plat/fvp-tc0-tbb:nil
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l1-build-plat/fvp-tc0-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/tc0.sh b/model/tc0.sh
deleted file mode 100644
index 415ebd9..0000000
--- a/model/tc0.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/SubSystemModels/11.17/18/models/$model_flavour/FVP_TC0"
-
-cat <<EOF >"$model_param_file"
--C css.terminal_uart_ap.start_port=5000
--C css.terminal_uart1_ap.start_port=5001
--C soc.terminal_s0.start_port=5002
--C soc.terminal_s1.start_port=5003
--C board.terminal_0.start_port=5004
--C board.terminal_1.start_port=5005
-
-${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
-${scp_rom_bin+-C css.scp.ROMloader.fname=$scp_rom_bin}
-${fip_bin+-C board.flashloader0.fname=$fip_bin}
-${initrd_bin+--data board.dram=$initrd_bin@${initrd_addr:?}}
-${kernel_bin+--data board.dram=$kernel_bin@${kernel_addr:?}}
-${uart0_out+-C soc.pl011_uart0.out_file=$uart0_out}
-${uart0_out+-C soc.pl011_uart0.unbuffered_output=1}
-${uart1_out+-C soc.pl011_uart1.out_file=$uart1_out}
-${uart1_out+-C soc.pl011_uart1.unbuffered_output=1}
-EOF
diff --git a/run_config/fvp-tc0 b/run_config/fvp-tc0
deleted file mode 100644
index b2c0d5b..0000000
--- a/run_config/fvp-tc0
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="tc0"
-
- uart="1" set_expect_variable "num_cpus" "8"
-
- set_run_env "ports_script" "$ci_root/model/tc-ports.awk"
- set_run_env "num_uarts" "2"
-
- model="$model" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-tc0.spm.tftf b/run_config/fvp-tc0.spm.tftf
deleted file mode 100644
index 1f11959..0000000
--- a/run_config/fvp-tc0.spm.tftf
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_build() {
- if [ ! -f "$archive/scp_ram.bin" ]; then
- url="$scp_prebuilts/tc$plat_variant/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
- archive_file "scp_ram.bin"
- fi
-
- build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin" SCP_BL2="$archive/scp_ram.bin"
-}
-
-fetch_tf_resource() {
- # Use SCP binary from SCP build if it exists, or fetch pre-built ones.
- if [ ! -f "$archive/scp_rom.bin" ]; then
- # Pick the appropriate binary based on target platform variant
- url="$scp_prebuilts/tc$plat_variant/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
- archive_file "scp_rom.bin"
- fi
-}
-
-generate_lava_job_template() {
- payload_type="tftf" gen_yaml_template
-}
-
-generate_lava_job() {
- local model="tc0"
-
- uart="0" port="5002" set_primary="1" file="tftf-non-primary.exp" track_expect
-
- uart="1" set_expect_variable "num_cpus" "8"
- uart="1" port="5003" file="spm-cactus-sp-uart1.exp" track_expect
-
- set_run_env "ports_script" "$ci_root/model/tc-ports.awk"
- set_run_env "num_uarts" "2"
-
- set_uart_port "${archive:?}" 2 5000
- set_uart_port "${archive:?}" 3 5001
-
- model="$model" memory_tagging_support_level="2" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/tf_config/fvp-tc0-spm b/tf_config/fvp-tc0-spm
deleted file mode 100644
index 6f215ea..0000000
--- a/tf_config/fvp-tc0-spm
+++ /dev/null
@@ -1,12 +0,0 @@
-ARM_ARCH_MINOR=5
-BRANCH_PROTECTION=1
-CROSS_COMPILE=aarch64-none-elf-
-CTX_INCLUDE_EL2_REGS=1
-CTX_INCLUDE_PAUTH_REGS=1
-CTX_INCLUDE_MTE_REGS=1
-ENABLE_SVE_FOR_SWD=1
-PLAT=tc
-SCP_BL2=/dev/null
-SPD=spmd
-SP_LAYOUT_FILE=${tftf_root}/build/tc/${bin_mode}/sp_layout.json
-TARGET_PLATFORM=0