refactor(plat/sgi): header files and macros

In preparation to add support for the latest Neoverse reference design
platforms, reorganize the header files to allow newer platforms to use a
different set of platform macros. In addition to this, rename the macros
to match the names used in trusted firmware.

Signed-off-by: Shriram K <shriram.k@arm.com>
Change-Id: Ic21601730650d59ed8e40f763a0d5c4a5c45d3a3
diff --git a/plat/arm/sgi/sgi575/include/platform_def.h b/plat/arm/sgi/sgi575/include/platform_def.h
index 1e5aff5..237978c 100644
--- a/plat/arm/sgi/sgi575/include/platform_def.h
+++ b/plat/arm/sgi/sgi575/include/platform_def.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -7,14 +7,19 @@
 #ifndef PLATFORM_DEF_H
 #define PLATFORM_DEF_H
 
-#include <sgi_base_platform_def.h>
+#include <sgi_soc_platform_def.h>
 
-#define SGI_CLUSTER_COUNT		2
-#define SGI_MAX_CPUS_PER_CLUSTER	4
-#define SGI_MAX_PE_PER_CPU		1
+#define PLAT_ARM_CLUSTER_COUNT		U(2)
+#define CSS_SGI_MAX_CPUS_PER_CLUSTER	U(4)
+#define CSS_SGI_MAX_PE_PER_CPU		U(1)
 
-/* Base address of trusted watchdog (SP805) */
-#define SP805_TWDOG_BASE		0x2A480000
-#define IRQ_TWDOG_INTID			86
+/* GIC related constants */
+#define PLAT_ARM_GICD_BASE		UL(0x30000000)
+#define PLAT_ARM_GICC_BASE		UL(0x2C000000)
+#define PLAT_ARM_GICR_BASE		UL(0x300C0000)
+
+/* Platform specific page table and MMU setup constants */
+#define PLAT_PHY_ADDR_SPACE_SIZE	(1ULL << 32)
+#define PLAT_VIRT_ADDR_SPACE_SIZE	(1ULL << 32)
 
 #endif /* PLATFORM_DEF_H */
diff --git a/plat/arm/sgi/sgi575/sgi575_topology.c b/plat/arm/sgi/sgi575/sgi575_topology.c
index bda06d3..c01ad83 100644
--- a/plat/arm/sgi/sgi575/sgi575_topology.c
+++ b/plat/arm/sgi/sgi575/sgi575_topology.c
@@ -32,11 +32,11 @@
  */
 const unsigned char sgi575_pd_tree_desc[] = {
 	/* Number of root nodes */
-	SGI_CLUSTER_COUNT,
+	PLAT_ARM_CLUSTER_COUNT,
 	/* Number of children for the 1st node */
-	SGI_MAX_CPUS_PER_CLUSTER,
+	CSS_SGI_MAX_CPUS_PER_CLUSTER,
 	/* Number of children for the 2nd node */
-	SGI_MAX_CPUS_PER_CLUSTER
+	CSS_SGI_MAX_CPUS_PER_CLUSTER
 };
 
 const unsigned char *tftf_plat_get_pwr_domain_tree_desc(void)