fvp: remove tc3 runc config from CI
TC3 doesn't boot with 11.28.23 model, with efforts to ensure a single
FVP version to be used in CI and tc4 usecases are available.
Remove usage of tc3 from l3 and l3 run configs. But l1 platform
builds are still retained.
Change-Id: I60b6029cc55c32ec4eba5308ba2cf3f6f680ebf2
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index a4062d1..c9ad1bd 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -56,7 +56,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_tc3="fvp:fvp_tc3_11.26_16_linux64;/opt/model/FVP_TC3/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
@@ -100,7 +99,6 @@
[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
[morello]="${fvp_morello};FVP_Morello"
[css-rdv1]="${fvp_rd_v1};FVP_RD_V1"
-[tc3]="${fvp_tc3};FVP_TC3"
[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/spm-l2-boot-tests/tc-default,fvp-tc3-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc3-debug b/group/spm-l2-boot-tests/tc-default,fvp-tc3-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc3-debug
deleted file mode 100644
index e337bb0..0000000
--- a/group/spm-l2-boot-tests/tc-default,fvp-tc3-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc3-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-arm-plats/fvp-tbb-tc3-mb:fvp-tc.crash-linux.tc-fip.tc-tc3-debug b/group/tf-l2-boot-tests-arm-plats/fvp-tbb-tc3-mb:fvp-tc.crash-linux.tc-fip.tc-tc3-debug
deleted file mode 100644
index 5e837af..0000000
--- a/group/tf-l2-boot-tests-arm-plats/fvp-tbb-tc3-mb:fvp-tc.crash-linux.tc-fip.tc-tc3-debug
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2023-2024 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-# Note that this uses the fvp-linux.tc run fragment, which does not actually boot to linux,
-# as it is the only way to get an image signed and assembled correctly for RSE to boot it.
-# If this is resolved at some point, that fragment should be removed.
diff --git a/group/tf-l2-boot-tests-arm-plats/fvp-tc3-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc3-debug b/group/tf-l2-boot-tests-arm-plats/fvp-tc3-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc3-debug
deleted file mode 100644
index e337bb0..0000000
--- a/group/tf-l2-boot-tests-arm-plats/fvp-tc3-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc3-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-arm-plats/fvp-tc3-rotpk:fvp-linux.tc-fip.tc-tc.crash-tc3-debug b/group/tf-l2-boot-tests-arm-plats/fvp-tc3-rotpk:fvp-linux.tc-fip.tc-tc.crash-tc3-debug
deleted file mode 100644
index e337bb0..0000000
--- a/group/tf-l2-boot-tests-arm-plats/fvp-tc3-rotpk:fvp-linux.tc-fip.tc-tc.crash-tc3-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-misc/fvp-tbb-tc3-mb:fvp-linux.tc-fip.tc-tc.signer-tc3-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-tc3-mb:fvp-linux.tc-fip.tc-tc.signer-tc3-debug
deleted file mode 100644
index e69de29..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-tbb-tc3-mb:fvp-linux.tc-fip.tc-tc.signer-tc3-debug
+++ /dev/null
diff --git a/group/tf-l2-boot-tests-misc/fvp-tc3-default,fvp-tc3-asymmetric:fvp-fip.tc.tftf-tc3-debug b/group/tf-l2-boot-tests-misc/fvp-tc3-default,fvp-tc3-asymmetric:fvp-fip.tc.tftf-tc3-debug
deleted file mode 100644
index 19363ec..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-tc3-default,fvp-tc3-asymmetric:fvp-fip.tc.tftf-tc3-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2024 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-misc/fvp-tc3-sve,fvp-tc3-cpu-extensions+sve:fvp-fip.tc.tftf-tc3+sve b/group/tf-l2-boot-tests-misc/fvp-tc3-sve,fvp-tc3-cpu-extensions+sve:fvp-fip.tc.tftf-tc3+sve
deleted file mode 100644
index 19363ec..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-tc3-sve,fvp-tc3-cpu-extensions+sve:fvp-fip.tc.tftf-tc3+sve
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2024 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-misc/fvp-tc3-tbb-dpe:fvp-linux.tc-fip.tc-tc3-debug b/group/tf-l2-boot-tests-misc/fvp-tc3-tbb-dpe:fvp-linux.tc-fip.tc-tc3-debug
deleted file mode 100644
index 19363ec..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-tc3-tbb-dpe:fvp-linux.tc-fip.tc-tc3-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2024 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-boot-tests-css/fvp-tc3-tbb:fvp-linux.tc-fip.tc-tc3-debug b/group/tf-l3-boot-tests-css/fvp-tc3-tbb:fvp-linux.tc-fip.tc-tc3-debug
deleted file mode 100644
index e337bb0..0000000
--- a/group/tf-l3-boot-tests-css/fvp-tc3-tbb:fvp-linux.tc-fip.tc-tc3-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/model/tc3-ports.awk b/model/tc3-ports.awk
deleted file mode 100644
index e199c78..0000000
--- a/model/tc3-ports.awk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2021-2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-/^terminal_s0:/ { ports[0] = $NF }
-/^terminal_s1:/ { ports[1] = $NF }
-/^terminal_uart_ap:/ { ports[2] = $NF }
-/^terminal_uart1_ap:/ { ports[3] = $NF }
-END {
- for (i = 0; i < num_uarts; i++) {
- if (ports[i] != "")
- print "ports[" i "]=" ports[i]
- }
-}
diff --git a/model/tc3.sh b/model/tc3.sh
deleted file mode 100644
index 05a6da8..0000000
--- a/model/tc3.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2022-2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-set_model_path "$warehouse/SysGen/SubSystemModels/11.26/16/models/$model_flavour/FVP_TC3"
-cat <<EOF >"$model_param_file"
-${fip_gpt_bin+-C board.flashloader0.fname=$fip_gpt_bin}
--C board.pl011_uart2.unbuffered_output=1
--C board.pl011_uart3.unbuffered_output=1
--C css.pl011_uart1_ap.unbuffered_output=1
--C css.pl011_uart_ap.unbuffered_output=1
--C soc.pl011_uart0.unbuffered_output=1
--C soc.pl011_uart1.unbuffered_output=1
--C css.sms.scp.uart.unbuffered_output=1
--C css.sms.rse_pl011_uart.unbuffered_output=1
--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 css.sms.scp.terminal_uart.start_port=5004
--C css.sms.rse_terminal_uart.start_port=5005
--C displayController=2
-${rse_rom_bin+-C css.sms.rse.rom.raw_image=$rse_rom_bin}
--C css.sms.rse.VMADDRWIDTH=16
--C css.sms.rse.intchecker.ICBC_RESET_VALUE=0x0000011B
--C css.sms.rse.sic.SIC_AUTH_ENABLE=1
--C css.sms.rse.sic.SIC_DECRYPT_ENABLE=1
-${rse_encrypted_cm_provisioning_bundle_0_bin+--data css.sms.rse.sram0=${rse_encrypted_cm_provisioning_bundle_0_bin}@0x400}
-${rse_encrypted_dm_provisioning_bundle_bin+--data css.sms.rse.sram1=${rse_encrypted_dm_provisioning_bundle_bin}@0x0}
--C css.cluster0.subcluster0.has_ete=1
--C css.cluster0.subcluster1.has_ete=1
--C css.cluster0.subcluster2.has_ete=1
--C board.smsc_91c111.enabled=1
--C board.hostbridge.userNetworking=1
--C board.hostbridge.userNetPorts="8080=80,8022=22"
-${tc_fitimage_bin+--data board.dram=$tc_fitimage_bin@0x20000000}
-EOF
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 05333be..205266b 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -16,15 +16,15 @@
# 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
- if [ $plat_variant -eq 3 ] || [ $plat_variant -eq 4 ]; then
+ if [ $plat_variant -eq 4 ]; then
url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
fi
archive_file "scp_rom.bin"
fi
- # RSE is applicable to TC3 and TC4
- if [ $plat_variant -eq 3 ] || [ $plat_variant -eq 4 ]; then
+ # RSE is applicable to TC4
+ if [ $plat_variant -eq 4 ]; then
# Hold RSE terminal_uart_ap
uart="1" port="5003" file="hold_uart.exp" track_expect
diff --git a/run_config/fvp-tc3 b/run_config/fvp-tc3
deleted file mode 100644
index 688ebce..0000000
--- a/run_config/fvp-tc3
+++ /dev/null
@@ -1,11 +0,0 @@
-generate_lava_job() {
- local model="tc3"
-
- uart="1" set_expect_variable "num_cpus" "8"
-
- set_run_env "ports_script" "$ci_root/model/tc3-ports.awk"
- set_run_env "num_uarts" "4"
-
- model="$model" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-tc3+sve b/run_config/fvp-tc3+sve
deleted file mode 100644
index 1ff9182..0000000
--- a/run_config/fvp-tc3+sve
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2022-2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
- local model="tc3"
-
- uart="1" set_expect_variable "num_cpus" "8"
-
- set_run_env "ports_script" "$ci_root/model/tc3-ports.awk"
- set_run_env "num_uarts" "4"
-
- model="$model" \
- sve_plugin="1" \
- gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/tf_config/fvp-tbb-tc3-mb b/tf_config/fvp-tbb-tc3-mb
deleted file mode 100644
index 17f3e8a..0000000
--- a/tf_config/fvp-tbb-tc3-mb
+++ /dev/null
@@ -1,11 +0,0 @@
-ARM_GPT_SUPPORT=1
-ARM_ROTPK_LOCATION=devel_rsa
-CROSS_COMPILE=aarch64-none-elf-
-GENERATE_COT=1
-PLAT=tc
-PLATFORM_TEST=tfm-testsuite
-MEASURED_BOOT=1
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SCP_BL2=/dev/null
-TARGET_PLATFORM=3
-TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tc3-default b/tf_config/fvp-tc3-default
deleted file mode 100644
index 1c7100d..0000000
--- a/tf_config/fvp-tc3-default
+++ /dev/null
@@ -1,5 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=tc
-TARGET_PLATFORM=3
-ARM_GPT_SUPPORT=1
-SCP_BL2=/dev/null
diff --git a/tf_config/fvp-tc3-nv-ctrs b/tf_config/fvp-tc3-nv-ctrs
deleted file mode 100644
index 7233107..0000000
--- a/tf_config/fvp-tc3-nv-ctrs
+++ /dev/null
@@ -1,10 +0,0 @@
-ARM_GPT_SUPPORT=1
-ARM_ROTPK_LOCATION=devel_rsa
-CROSS_COMPILE=aarch64-none-elf-
-GENERATE_COT=1
-PLAT=tc
-PLATFORM_TEST=rse-nv-counters
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SCP_BL2=/dev/null
-TARGET_PLATFORM=3
-TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tc3-rotpk b/tf_config/fvp-tc3-rotpk
deleted file mode 100644
index cb91c85..0000000
--- a/tf_config/fvp-tc3-rotpk
+++ /dev/null
@@ -1,10 +0,0 @@
-ARM_GPT_SUPPORT=1
-ARM_ROTPK_LOCATION=devel_rsa
-CROSS_COMPILE=aarch64-none-elf-
-GENERATE_COT=1
-PLAT=tc
-PLATFORM_TEST=rse-rotpk
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SCP_BL2=/dev/null
-TARGET_PLATFORM=3
-TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tc3-spm b/tf_config/fvp-tc3-spm
deleted file mode 100644
index e7c1fe8..0000000
--- a/tf_config/fvp-tc3-spm
+++ /dev/null
@@ -1,12 +0,0 @@
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=7
-ARM_GPT_SUPPORT=1
-BRANCH_PROTECTION=1
-CROSS_COMPILE=aarch64-none-elf-
-ENABLE_FEAT_MTE2=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=3
diff --git a/tf_config/fvp-tc3-sve b/tf_config/fvp-tc3-sve
deleted file mode 100644
index 1c1fbfd..0000000
--- a/tf_config/fvp-tc3-sve
+++ /dev/null
@@ -1,13 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=7
-PLAT=tc
-TARGET_PLATFORM=3
-ENABLE_FEAT_AMU=1
-ENABLE_FEAT_AMUv1p1=1
-ENABLE_AMU_AUXILIARY_COUNTERS=1
-ENABLE_MPMM=1
-ENABLE_SVE_FOR_NS=1
-ENABLE_SVE_FOR_SWD=1
-ARM_GPT_SUPPORT=1
-SCP_BL2=/dev/null
diff --git a/tf_config/fvp-tc3-tbb-dpe b/tf_config/fvp-tc3-tbb-dpe
deleted file mode 100644
index 08e71fc..0000000
--- a/tf_config/fvp-tc3-tbb-dpe
+++ /dev/null
@@ -1,16 +0,0 @@
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=7
-ARM_GPT_SUPPORT=1
-ARM_ROTPK_LOCATION=devel_rsa
-BRANCH_PROTECTION=1
-CROSS_COMPILE=aarch64-none-elf-
-DICE_PROTECTION_ENVIRONMENT=1
-ENABLE_SVE_FOR_SWD=1
-GENERATE_COT=1
-MEASURED_BOOT=1
-PLAT=tc
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SCP_BL2=/dev/null
-TARGET_PLATFORM=3
-TRUSTED_BOARD_BOOT=1
-ENABLE_FEAT_MTE2=1
diff --git a/tftf_config/fvp-tc3-asymmetric b/tftf_config/fvp-tc3-asymmetric
deleted file mode 100644
index 5a070cc..0000000
--- a/tftf_config/fvp-tc3-asymmetric
+++ /dev/null
@@ -1,6 +0,0 @@
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=7
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=tc
-TARGET_PLATFORM=3
-TESTS=asymmetric-features
diff --git a/tftf_config/fvp-tc3-cpu-extensions+sve b/tftf_config/fvp-tc3-cpu-extensions+sve
deleted file mode 100644
index 0876d20..0000000
--- a/tftf_config/fvp-tc3-cpu-extensions+sve
+++ /dev/null
@@ -1,7 +0,0 @@
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=7
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=tc
-TARGET_PLATFORM=3
-TESTS=cpu-extensions
-PLAT_AMU_GROUP1_COUNTERS_MASK=4