refactor(sgi): replace build-option prefix to "NRD"
As of now, CSS_SGI_PLATFORM_VARIANT and CSS_SGI_CHIP_COUNT are the
external build option that sgi platforms support. As "sgi" has been
renamed to "neoverse_rd", replace the prefix "CSS_SGI" with "NRD".
Signed-off-by: Rohit Mathew <Rohit.Mathew@arm.com>
Change-Id: I585575788c14d1c3b26ab336672ef149771dab98
diff --git a/plat/arm/neoverse_rd/common/nrd_common.mk b/plat/arm/neoverse_rd/common/nrd_common.mk
index 14195db..72aaff1 100644
--- a/plat/arm/neoverse_rd/common/nrd_common.mk
+++ b/plat/arm/neoverse_rd/common/nrd_common.mk
@@ -23,5 +23,5 @@
$(error "USE_NVM is not supported on SGI platforms")
endif
-# Pass CSS_SGI_PLATFORM_VARIANT flag to the build system
-$(eval $(call add_define,TFTF_DEFINES,CSS_SGI_PLATFORM_VARIANT))
+# Pass NRD_PLATFORM_VARIANT flag to the build system
+$(eval $(call add_define,TFTF_DEFINES,NRD_PLATFORM_VARIANT))
diff --git a/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk b/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk
index 3752416..9f92efd 100644
--- a/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk
@@ -12,7 +12,7 @@
PLAT_TESTS_SKIP_LIST := plat/arm/neoverse_rd/platform/rdn1edge/tests_to_skip.txt
-ifdef CSS_SGI_PLATFORM_VARIANT
-$(error "CSS_SGI_PLATFORM_VARIANT should not be set for RD-N1-Edge, \
- currently set to ${CSS_SGI_PLATFORM_VARIANT}.")
+ifdef NRD_PLATFORM_VARIANT
+$(error "NRD_PLATFORM_VARIANT should not be set for RD-N1-Edge, \
+ currently set to ${NRD_PLATFORM_VARIANT}.")
endif
diff --git a/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
index 4523653..d48696b 100644
--- a/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
@@ -13,9 +13,9 @@
* The RD-N2 Cfg1 platform is a variant of the RD-N2 platform with a
* reduced interconnect mesh size (3x3) and core count (8-cores).
*
- * The $CSS_SGI_PLATFORM_VARIANT flag is set to 1 for RD-N2-Cfg1 platform.
+ * The $NRD_PLATFORM_VARIANT flag is set to 1 for RD-N2-Cfg1 platform.
*/
-#if (CSS_SGI_PLATFORM_VARIANT == 1)
+#if (NRD_PLATFORM_VARIANT == 1)
#define PLAT_ARM_CLUSTER_COUNT U(8)
#else
#define PLAT_ARM_CLUSTER_COUNT U(16)
@@ -25,7 +25,7 @@
/* GIC-600 & interrupt handling related constants */
#define PLAT_ARM_GICD_BASE UL(0x30000000)
-#if (CSS_SGI_PLATFORM_VARIANT == 1)
+#if (NRD_PLATFORM_VARIANT == 1)
#define PLAT_ARM_GICR_BASE UL(0x30100000)
#else
#define PLAT_ARM_GICR_BASE UL(0x301C0000)
diff --git a/plat/arm/neoverse_rd/platform/rdn2/platform.mk b/plat/arm/neoverse_rd/platform/rdn2/platform.mk
index d79af3e..31d91a1 100644
--- a/plat/arm/neoverse_rd/platform/rdn2/platform.mk
+++ b/plat/arm/neoverse_rd/platform/rdn2/platform.mk
@@ -14,8 +14,8 @@
RD_N2_VARIANTS := 0 1 3
-ifneq ($(CSS_SGI_PLATFORM_VARIANT), \
- $(filter $(CSS_SGI_PLATFORM_VARIANT),$(RD_N2_VARIANTS)))
- $(error "CSS_SGI_PLATFORM_VARIANT for RD-N2 should be 0 1 or 3, currently \
- set to ${CSS_SGI_PLATFORM_VARIANT}.")
+ifneq ($(NRD_PLATFORM_VARIANT), \
+ $(filter $(NRD_PLATFORM_VARIANT),$(RD_N2_VARIANTS)))
+ $(error "NRD_PLATFORM_VARIANT for RD-N2 should be 0 1 or 3, currently \
+ set to ${NRD_PLATFORM_VARIANT}.")
endif
diff --git a/plat/arm/neoverse_rd/platform/rdn2/topology.c b/plat/arm/neoverse_rd/platform/rdn2/topology.c
index b98f302..54d6801 100644
--- a/plat/arm/neoverse_rd/platform/rdn2/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdn2/topology.c
@@ -28,7 +28,7 @@
{ 6, 0 },
/* Cluster7: 1 core */
{ 7, 0 },
-#if (CSS_SGI_PLATFORM_VARIANT == 0)
+#if (NRD_PLATFORM_VARIANT == 0)
/* Cluster8: 1 core */
{ 8, 0 },
/* Cluster9: 1 core */
@@ -73,7 +73,7 @@
CSS_SGI_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 8th node */
CSS_SGI_MAX_CPUS_PER_CLUSTER,
-#if (CSS_SGI_PLATFORM_VARIANT == 0)
+#if (NRD_PLATFORM_VARIANT == 0)
/* Number of children for the 9th node */
CSS_SGI_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 10th node */
diff --git a/plat/arm/neoverse_rd/platform/rdv1/platform.mk b/plat/arm/neoverse_rd/platform/rdv1/platform.mk
index 453c9da..cfb8543 100644
--- a/plat/arm/neoverse_rd/platform/rdv1/platform.mk
+++ b/plat/arm/neoverse_rd/platform/rdv1/platform.mk
@@ -12,7 +12,7 @@
PLAT_TESTS_SKIP_LIST := plat/arm/neoverse_rd/platform/rdv1/tests_to_skip.txt
-ifdef CSS_SGI_PLATFORM_VARIANT
-$(error "CSS_SGI_PLATFORM_VARIANT should not be set for RD-V1, \
- currently set to ${CSS_SGI_PLATFORM_VARIANT}.")
+ifdef NRD_PLATFORM_VARIANT
+$(error "NRD_PLATFORM_VARIANT should not be set for RD-V1, \
+ currently set to ${NRD_PLATFORM_VARIANT}.")
endif
diff --git a/plat/arm/neoverse_rd/platform/sgi575/platform.mk b/plat/arm/neoverse_rd/platform/sgi575/platform.mk
index a83aeaf..5e81be5 100644
--- a/plat/arm/neoverse_rd/platform/sgi575/platform.mk
+++ b/plat/arm/neoverse_rd/platform/sgi575/platform.mk
@@ -12,7 +12,7 @@
PLAT_TESTS_SKIP_LIST := plat/arm/neoverse_rd/platform/sgi575/tests_to_skip.txt
-ifdef CSS_SGI_PLATFORM_VARIANT
-$(error "CSS_SGI_PLATFORM_VARIANT should not be set for SGI-575, \
- currently set to ${CSS_SGI_PLATFORM_VARIANT}.")
+ifdef NRD_PLATFORM_VARIANT
+$(error "NRD_PLATFORM_VARIANT should not be set for SGI-575, \
+ currently set to ${NRD_PLATFORM_VARIANT}.")
endif