From fa07049ee7dafca218ed49356e771241560884b3 Mon Sep 17 00:00:00 2001 From: Daniel Boulby Date: Thu, 22 Jun 2023 15:26:07 +0100 Subject: [PATCH] docs: remove deprecated tc0 from list of supported FVPs TC0 is now a deprecated platform so remove it from the list of supported FVPs as well as throwing an error if it is attempted to be built. Signed-off-by: Daniel Boulby Change-Id: Id013fcecbe20700611463ef9eab8cb3ae09071cc --- docs/plat/arm/fvp/index.rst | 3 +-- docs/plat/arm/tc/index.rst | 2 +- plat/arm/board/tc/platform.mk | 10 +--------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/plat/arm/fvp/index.rst b/docs/plat/arm/fvp/index.rst index 42c0eda25..fcfa04aba 100644 --- a/docs/plat/arm/fvp/index.rst +++ b/docs/plat/arm/fvp/index.rst @@ -51,7 +51,6 @@ Arm FVPs without shifted affinities, and that do not support threaded CPU cores - ``FVP_Morello`` (Version 0.11/33) - ``FVP_RD_E1_edge`` (Version 11.17/29) - ``FVP_RD_V1`` (Version 11.17/29) -- ``FVP_TC0`` (Version 11.17/18) - ``FVP_TC1`` (Version 11.17/33) - ``FVP_TC2`` (Version 11.18/28) @@ -631,7 +630,7 @@ boot Linux with 4 CPUs using the AArch32 build of TF-A. -------------- -*Copyright (c) 2019-2022, Arm Limited. All rights reserved.* +*Copyright (c) 2019-2023, Arm Limited. All rights reserved.* .. _FW_CONFIG for FVP: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/plat/arm/board/fvp/fdts/fvp_fw_config.dts .. _Arm's website: `FVP models`_ diff --git a/docs/plat/arm/tc/index.rst b/docs/plat/arm/tc/index.rst index df1847d61..925befc41 100644 --- a/docs/plat/arm/tc/index.rst +++ b/docs/plat/arm/tc/index.rst @@ -17,7 +17,7 @@ Currently, the main difference between TC0 (TARGET_PLATFORM=0), TC1 (TARGET_PLATFORM=1), TC2 (TARGET_PLATFORM=2) platforms w.r.t to TF-A is the CPUs supported as below: -- TC0 has support for Cortex A510, Cortex A710 and Cortex X2. +- TC0 has support for Cortex A510, Cortex A710 and Cortex X2. (Note TC0 is now deprecated) - TC1 has support for Cortex A510, Cortex Makalu and Cortex X3. - TC2 has support for Hayes and Hunter Arm CPUs. diff --git a/plat/arm/board/tc/platform.mk b/plat/arm/board/tc/platform.mk index c29537c7e..d383ead43 100644 --- a/plat/arm/board/tc/platform.mk +++ b/plat/arm/board/tc/platform.mk @@ -6,8 +6,7 @@ include common/fdt_wrappers.mk ifeq ($(TARGET_PLATFORM), 0) -$(warning Platform ${PLAT}$(TARGET_PLATFORM) is deprecated. \ -Some of the features might not work as expected) + $(error Platform ${PLAT}$(TARGET_PLATFORM) is deprecated.) endif ifeq ($(shell expr $(TARGET_PLATFORM) \<= 2), 0) @@ -70,13 +69,6 @@ TC_BASE = plat/arm/board/tc PLAT_INCLUDES += -I${TC_BASE}/include/ -# CPU libraries for TARGET_PLATFORM=0 -ifeq (${TARGET_PLATFORM}, 0) -TC_CPU_SOURCES += lib/cpus/aarch64/cortex_a510.S \ - lib/cpus/aarch64/cortex_a710.S \ - lib/cpus/aarch64/cortex_x2.S -endif - # CPU libraries for TARGET_PLATFORM=1 ifeq (${TARGET_PLATFORM}, 1) TC_CPU_SOURCES += lib/cpus/aarch64/cortex_a510.S \