tc: Remove support for TC2 platform
TC2 platform has been deprecated (TF-A: 49d6e19). Remove TC2
model script and other related script snippets.
Change-Id: Ifa0aadc88a3a3173ad6ad9fe206858d808f638f3
Signed-off-by: David Vincze <david.vincze@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index c264762..a3d398b 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_v1="fvp:fvp_rd_v1_${model_version}_${model_build};/opt/model/FVP_RD_V1/models/${model_flavour}"
-fvp_tc2="fvp:fvp_tc2_11.23_17;/opt/model/FVP_TC2/models/${model_flavour}"
fvp_tc3="fvp:fvp_tc3_11.26_16_linux64;/opt/model/FVP_TC3/models/${model_flavour}"
# FVP associate array, run_config are keys and fvp container parameters are the values
@@ -101,7 +100,6 @@
[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
[morello]="${fvp_morello};FVP_Morello"
[css-rdv1]="${fvp_rd_v1};FVP_RD_V1"
-[tc2]="${fvp_tc2};FVP_TC2"
[tc3]="${fvp_tc3};FVP_TC3"
[baser-aemv8r]="${fvp_base_aemv8r};FVP_BaseR_AEMv8R"
[rd1ae]="${fvp_rd_1_ae};FVP_RD_1_AE"
diff --git a/model/tc2.sh b/model/tc2.sh
deleted file mode 100644
index afed830..0000000
--- a/model/tc2.sh
+++ /dev/null
@@ -1,47 +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.23/17/models/$model_flavour/FVP_TC2"
-
-if is_arm_jenkins_env || upon "$local_ci"; then
- default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/11.23/17/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
-else
- # OpenCI enviroment
- source "$ci_root/fvp_utils.sh"
-
- # fvp_models variable contains the information for FVP paths, where 2nd field
- # points to the /opt/model/*/models/${model_flavour}
- models_dir="$(echo ${fvp_models[$model]} | awk -F ';' '{print $2}')"
- set_model_path "$models_dir"
-
- # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
- default_var sve_plugin_path "${models_dir/models/plugins}/ScalableVectorExtension.so"
-fi
-
-reset_var sve_plugin
-
-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
-${fip_gpt_bin+-C board.flashloader0.fname=$fip_gpt_bin}
-${tc_fitimage_bin+--data board.dram=$tc_fitimage_bin@0x20000000}
-${vmmaddrwidth+-C css.rss.VMADDRWIDTH=$vmmaddrwidth}
-${rse_rom_bin+-C css.rss.rom.raw_image=$rse_rom_bin}
--C displayController=2
--C css.rss.CMU0_NUM_DB_CH=16
--C css.rss.CMU1_NUM_DB_CH=16
-${rse_encrypted_cm_provisioning_bundle_0_bin+--data css.rss.sram0=${rse_encrypted_cm_provisioning_bundle_0_bin}@0x400}
-${rse_encrypted_dm_provisioning_bundle_bin+--data css.rss.sram1=${rse_encrypted_dm_provisioning_bundle_bin}@0x80000}
-
-${sve_plugin+--plugin=$sve_plugin_path}
-${sve_plugin+-C SVE.ScalableVectorExtension.enable_at_reset=0}
-${sve_plugin+-C SVE.ScalableVectorExtension.veclen=$((128 / 8))}
-EOF
diff --git a/run_config/tc_rse_utils.sh b/run_config/tc_rse_utils.sh
index f81eab0..d15fc1f 100644
--- a/run_config/tc_rse_utils.sh
+++ b/run_config/tc_rse_utils.sh
@@ -16,11 +16,7 @@
host_binary_layout="`basename -s .bin ${1}`_ns"
# development PEM containing a key - use same key which is used for SCP BL1 in pre-built image
- if [ $plat_variant -eq 2 ]; then
- url="$tc_prebuilts/tc$plat_variant/root-RSA-3072.pem" saveas="root-RSA-3072.pem" fetch_file
- archive_file "root-RSA-3072.pem"
- RSE_SIGN_PRIVATE_KEY=$archive/root-RSA-3072.pem
- elif [ $plat_variant -eq 3 ]; then
+ if [ $plat_variant -eq 3 ]; then
url="$tc_prebuilts/tc$plat_variant/root-EC-P256.pem" saveas="root-EC-P256.pem" fetch_file
archive_file "root-EC-P256.pem"
RSE_SIGN_PRIVATE_KEY=$archive/root-EC-P256.pem
@@ -82,10 +78,7 @@
archive_file "rse_bl2_signed.bin"
# Get pre-built rse TF-M S signed bin
- if [ $plat_variant -eq 2 ]; then
- url="$prebuild_prefix/rse_s_signed.bin" fetch_file
- archive_file "rse_s_signed.bin"
- elif [ $plat_variant -eq 3 ]; then
+ if [ $plat_variant -eq 3 ]; then
url="$prebuild_prefix/rse_s_encrypted.bin" fetch_file
archive_file "rse_s_encrypted.bin"
url="$prebuild_prefix/rse_s_sic_tables_signed.bin" fetch_file
@@ -97,15 +90,7 @@
archive_file "signed_scp_romfw.bin"
# Create FIP layout
- if [ $plat_variant -eq 2 ]; then
- "$fiptool" update \
- --align 8192 --rse-bl2 "$archive/rse_bl2_signed.bin" \
- --align 8192 --rse-s "$archive/rse_s_signed.bin" \
- --align 8192 --rse-scp-bl1 "$archive/signed_scp_romfw.bin" \
- --align 8192 --rse-ap-bl1 "$archive/$signed_bin" \
- --out "host_flash_fip.bin" \
- "$archive/fip.bin"
- elif [ $plat_variant -eq 3 ]; then
+ if [ $plat_variant -eq 3 ]; then
"$fiptool" update \
--align 8192 --rse-bl2 "$archive/rse_bl2_signed.bin" \
--align 8192 --rse-scp-bl1 "$archive/signed_scp_romfw.bin" \
diff --git a/tc_utils.sh b/tc_utils.sh
index 3ab33b6..0f41431 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -16,18 +16,11 @@
kernel_addr=0x80000
scp_ram_addr=0x0bd80000
-rse_rom_addr=0x11000000
-vmmaddrwidth=19
-rvbaddr_lw=0x0000
-rvbaddr_up=0x0000
-
# AP bl1 0x00 is mapped to 0x70000000 in RSE memory map
ap_bl1_flash_load_addr=0x70000000
ap_bl1_flash_size=0x20000
-if [ $plat_variant -eq 2 ]; then
- rse_revision="4ab7a20d"
-elif [ $plat_variant -eq 3 ]; then
+if [ $plat_variant -eq 3 ]; then
rse_revision="2fe1f7e"
scp_revision="ac2b4f1"
elif [ $plat_variant -eq 4 ]; then