refactor(tc): Make tc0 tftf code generic to tc.

This code can be used for tc0, tc1 and tc2 testing so change from
tc0 naming to tc.

Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: Ied011db0cd688936d6ba20e48c5206de4891e732

10 files changed, 25 insertions, 25 deletions

diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts
index 01caf4d..01caf4d 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts
index dba2777..dba2777 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus.dts b/spm/cactus/plat/arm/tc/fdts/cactus.dts
index 99d3ae8..99d3ae8 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus.dts
diff --git a/spm/cactus/plat/arm/tc0/include/sp_platform_def.h b/spm/cactus/plat/arm/tc/include/sp_platform_def.h
index 3d288e6..4a86127 100644
--- a/spm/cactus/plat/arm/tc0/include/sp_platform_def.h
+++ b/spm/cactus/plat/arm/tc/include/sp_platform_def.h
@@ -18,8 +18,8 @@
 #define PLAT_SP_RX_BASE			ULL(0xfe300000)
 #define PLAT_SP_CORE_COUNT		U(8)
 
-#define PLAT_ARM_DEVICE0_BASE		TC0_DEVICE0_BASE
-#define PLAT_ARM_DEVICE0_SIZE		TC0_DEVICE0_SIZE
+#define PLAT_ARM_DEVICE0_BASE		TC_DEVICE0_BASE
+#define PLAT_ARM_DEVICE0_SIZE		TC_DEVICE0_SIZE
 
 #define CACTUS_PL011_UART_BASE		PL011_UART1_BASE
 #define CACTUS_PL011_UART_CLK_IN_HZ	PL011_UART1_CLK_IN_HZ
diff --git a/spm/cactus/plat/arm/tc/platform.mk b/spm/cactus/plat/arm/tc/platform.mk
new file mode 100644
index 0000000..f3c8b3e
--- /dev/null
+++ b/spm/cactus/plat/arm/tc/platform.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+TC_CACTUS_BASE		= spm/cactus/plat/arm/tc
+
+PLAT_INCLUDES		+= -I${TC_CACTUS_BASE}/include/
+
+# Add the FDT source
+CACTUS_DTS		= ${TC_CACTUS_BASE}/fdts/cactus.dts
+
+# List of FDTS to copy
+FDTS_CP_LIST		= ${TC_CACTUS_BASE}/fdts/cactus.dts
+FDTS_CP_LIST		+= ${TC_CACTUS_BASE}/fdts/cactus-secondary.dts
+FDTS_CP_LIST		+= ${TC_CACTUS_BASE}/fdts/cactus-tertiary.dts
diff --git a/spm/cactus/plat/arm/tc0/platform.mk b/spm/cactus/plat/arm/tc0/platform.mk
deleted file mode 100644
index 3bc245e..0000000
--- a/spm/cactus/plat/arm/tc0/platform.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-TC0_CACTUS_BASE		= spm/cactus/plat/arm/tc0
-
-PLAT_INCLUDES		+= -I${TC0_CACTUS_BASE}/include/
-
-# Add the FDT source
-CACTUS_DTS		= ${TC0_CACTUS_BASE}/fdts/cactus.dts
-
-# List of FDTS to copy
-FDTS_CP_LIST		= ${TC0_CACTUS_BASE}/fdts/cactus.dts
-FDTS_CP_LIST		+= ${TC0_CACTUS_BASE}/fdts/cactus-secondary.dts
-FDTS_CP_LIST		+= ${TC0_CACTUS_BASE}/fdts/cactus-tertiary.dts
diff --git a/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel0.dts b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts
index f8d4f63..bbc7b00 100644
--- a/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel0.dts
+++ b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts
@@ -13,7 +13,7 @@
 	compatible = "arm,ffa-manifest-1.0";
 
 	/* Properties */
-	description = "ivy-sel0-tc0";
+	description = "ivy-sel0-tc";
 	ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
 	uuid = <0xd883baea 0xaf4eafba 0xfdf74481 0xa744e5cb>;
 	execution-ctx-count = <1>;
diff --git a/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel1.dts b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts
index d9da2a5..322dd74 100644
--- a/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel1.dts
+++ b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts
@@ -14,7 +14,7 @@
 	compatible = "arm,ffa-manifest-1.0";
 
 	/* Properties */
-	description = "ivy-sel1-tc0";
+	description = "ivy-sel1-tc";
 	ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
 	uuid = <0xd883baea 0xaf4eafba 0xfdf74481 0xa744e5cb>;
 	execution-ctx-count = <1>;
diff --git a/spm/ivy/app/plat/arm/tc0/include/sp_platform_def.h b/spm/ivy/app/plat/arm/tc/include/sp_platform_def.h
index 326cb13..326cb13 100644
--- a/spm/ivy/app/plat/arm/tc0/include/sp_platform_def.h
+++ b/spm/ivy/app/plat/arm/tc/include/sp_platform_def.h
diff --git a/spm/ivy/app/plat/arm/tc0/platform.mk b/spm/ivy/app/plat/arm/tc/platform.mk
index 72b1521..2105706 100644
--- a/spm/ivy/app/plat/arm/tc0/platform.mk
+++ b/spm/ivy/app/plat/arm/tc/platform.mk
@@ -4,15 +4,15 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-TC0_IVY_BASE		= spm/ivy/app/plat/arm/tc0
+TC_IVY_BASE		= spm/ivy/app/plat/arm/tc
 
-PLAT_INCLUDES		+= -I${TC0_IVY_BASE}/include/
+PLAT_INCLUDES		+= -I${TC_IVY_BASE}/include/
 
 # Add the FDT source
 ifeq ($(IVY_SHIM),0)
-IVY_DTS		= ${TC0_IVY_BASE}/fdts/ivy-sel0.dts
+IVY_DTS		= ${TC_IVY_BASE}/fdts/ivy-sel0.dts
 else
-IVY_DTS		= ${TC0_IVY_BASE}/fdts/ivy-sel1.dts
+IVY_DTS		= ${TC_IVY_BASE}/fdts/ivy-sel1.dts
 endif
 
 # List of FDTS to copy