refactor(sgi): regroup "sgi" and "rdinfra" to "neoverse_rd"
Currently, reference design platforms such as RD-N2, RD-N1-Edge, RD-V1,
and SGI-575 utilize "sgi/common" as the common source directory. The
"sgi" prefix originated from the System Guidance Infrastructure (SGI)
and was initially associated with the SGI-575 platform. However,
subsequent platforms released were under the Neoverse reference design
product name.
To align with the Neoverse reference design nomenclature, regroup all
common and board files within neoverse_rd directory. Consolidate common
sources and headers under neoverse_rd/common. Board files for RD-V1,
RD-N2, RD-N1-Edge and SGI-575 are moved to neoverse_rd/platform. With
the changes in this commit, the tree view would look as follows:
├── neoverse_rd
│ ├── common
│ │ ├── arch
│ │ └── include
│ └── platform
│ ├── rdn1edge
│ ├── rdn2
│ ├── rdv1
│ └── sgi575
Additionally, update all file prefixes from "sgi" to "nrd."
Signed-off-by: Rohit Mathew <Rohit.Mathew@arm.com>
Change-Id: I07e2af143fad82e48172612fe0e28db6464fa901
diff --git a/plat/arm/sgi/common/aarch64/plat_helpers.S b/plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
similarity index 96%
rename from plat/arm/sgi/common/aarch64/plat_helpers.S
rename to plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
index e17c509..647bdaf 100644
--- a/plat/arm/sgi/common/aarch64/plat_helpers.S
+++ b/plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
diff --git a/plat/arm/sgi/common/include/sgi_base_platform_def.h b/plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
similarity index 94%
rename from plat/arm/sgi/common/include/sgi_base_platform_def.h
rename to plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
index 04673b3..672eb80 100644
--- a/plat/arm/sgi/common/include/sgi_base_platform_def.h
+++ b/plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef SGI_BASE_PLATFORM_DEF_H
-#define SGI_BASE_PLATFORM_DEF_H
+#ifndef NRD_BASE_PLATFORM_DEF_H
+#define NRD_BASE_PLATFORM_DEF_H
#include <lib/utils_def.h>
@@ -106,4 +106,4 @@
/* Per-CPU Hypervisor Timer Interrupt ID */
#define IRQ_PCPU_HP_TIMER 26
-#endif /* SGI_BASE_PLATFORM_DEF_H */
+#endif /* NRD_BASE_PLATFORM_DEF_H */
diff --git a/plat/arm/sgi/common/include/sgi_soc_css_def.h b/plat/arm/neoverse_rd/common/include/nrd_soc_css_def.h
similarity index 60%
rename from plat/arm/sgi/common/include/sgi_soc_css_def.h
rename to plat/arm/neoverse_rd/common/include/nrd_soc_css_def.h
index da73b3e..bffe189 100644
--- a/plat/arm/sgi/common/include/sgi_soc_css_def.h
+++ b/plat/arm/neoverse_rd/common/include/nrd_soc_css_def.h
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef SGI_SOC_CSS_DEF_H
-#define SGI_SOC_CSS_DEF_H
+#ifndef NRD_SOC_CSS_DEF_H
+#define NRD_SOC_CSS_DEF_H
/* Trusted watchdog (SP805) Interrupt ID */
#define IRQ_TWDOG_INTID 86
@@ -16,4 +16,4 @@
/* AP_REFCLK Generic Timer, Non-secure. */
#define IRQ_CNTPSIRQ1 92
-#endif /* SGI_SOC_CSS_DEF_H */
+#endif /* NRD_SOC_CSS_DEF_H */
diff --git a/plat/arm/neoverse_rd/common/include/nrd_soc_css_def_v2.h b/plat/arm/neoverse_rd/common/include/nrd_soc_css_def_v2.h
new file mode 100644
index 0000000..5d4f5e6
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/include/nrd_soc_css_def_v2.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef NRD_SOC_CSS_DEF_V2_H
+#define NRD_SOC_CSS_DEF_V2_H
+
+/* Trusted watchdog (SP805) Interrupt ID */
+#define IRQ_TWDOG_INTID 107
+
+/* Maximum SPI */
+#define PLAT_MAX_SPI_OFFSET_ID 256
+
+/* AP_REFCLK Generic Timer, Non-secure. */
+#define IRQ_CNTPSIRQ1 109
+
+#endif /* NRD_SOC_CSS_DEF_V2_H */
+
diff --git a/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def.h b/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def.h
new file mode 100644
index 0000000..d329688
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2022-2024, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef NRD_SOC_PLATFORM_H
+#define NRD_SOC_PLATFORM_H
+
+#include <nrd_base_platform_def.h>
+#include <nrd_soc_css_def.h>
+
+/* Base address of non-trusted watchdog (SP805) */
+#define SP805_WDOG_BASE UL(0x1C0F0000)
+
+#endif /* NRD_SOC_PLATFORM_H */
diff --git a/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def_v2.h b/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def_v2.h
new file mode 100644
index 0000000..7a23c51
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def_v2.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2022-2024, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef NRD_SOC_PLATFORM_V2_H
+#define NRD_SOC_PLATFORM_V2_H
+
+#include <nrd_base_platform_def.h>
+#include <nrd_soc_css_def_v2.h>
+
+/* Base address of non-trusted watchdog (SP805) */
+#define SP805_WDOG_BASE UL(0x0C0F0000)
+
+#endif /* NRD_SOC_PLATFORM_V2_H */
diff --git a/plat/arm/sgi/common/sgi_common.mk b/plat/arm/neoverse_rd/common/nrd_common.mk
similarity index 60%
rename from plat/arm/sgi/common/sgi_common.mk
rename to plat/arm/neoverse_rd/common/nrd_common.mk
index 45d8485..14195db 100644
--- a/plat/arm/sgi/common/sgi_common.mk
+++ b/plat/arm/neoverse_rd/common/nrd_common.mk
@@ -1,10 +1,10 @@
#
-# Copyright (c) 2018-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-PLAT_INCLUDES := -Iplat/arm/sgi/common/include/
+PLAT_INCLUDES := -Iplat/arm/neoverse_rd/common/include/
PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \
drivers/arm/gic/gic_v2.c \
@@ -12,10 +12,10 @@
drivers/arm/sp805/sp805.c \
drivers/arm/timer/private_timer.c \
drivers/arm/timer/system_timer.c \
- plat/arm/sgi/common/${ARCH}/plat_helpers.S \
- plat/arm/sgi/common/plat_setup.c \
- plat/arm/sgi/common/sgi_mem_prot.c \
- plat/arm/sgi/common/sgi_pwr_state.c
+ plat/arm/neoverse_rd/common/arch/${ARCH}/plat_helpers.S\
+ plat/arm/neoverse_rd/common/plat_setup.c \
+ plat/arm/neoverse_rd/common/nrd_mem_prot.c \
+ plat/arm/neoverse_rd/common/nrd_pwr_state.c
include plat/arm/common/arm_common.mk
diff --git a/plat/arm/sgi/common/sgi_mem_prot.c b/plat/arm/neoverse_rd/common/nrd_mem_prot.c
similarity index 82%
rename from plat/arm/sgi/common/sgi_mem_prot.c
rename to plat/arm/neoverse_rd/common/nrd_mem_prot.c
index 14da4cd..09504e0 100644
--- a/plat/arm/sgi/common/sgi_mem_prot.c
+++ b/plat/arm/neoverse_rd/common/nrd_mem_prot.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
diff --git a/plat/arm/sgi/common/sgi_pwr_state.c b/plat/arm/neoverse_rd/common/nrd_pwr_state.c
similarity index 93%
rename from plat/arm/sgi/common/sgi_pwr_state.c
rename to plat/arm/neoverse_rd/common/nrd_pwr_state.c
index 305d1f5..7b01257 100644
--- a/plat/arm/sgi/common/sgi_pwr_state.c
+++ b/plat/arm/neoverse_rd/common/nrd_pwr_state.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
diff --git a/plat/arm/sgi/common/plat_setup.c b/plat/arm/neoverse_rd/common/plat_setup.c
similarity index 87%
rename from plat/arm/sgi/common/plat_setup.c
rename to plat/arm/neoverse_rd/common/plat_setup.c
index f343f8d..e6d4c0d 100644
--- a/plat/arm/sgi/common/plat_setup.c
+++ b/plat/arm/neoverse_rd/common/plat_setup.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
diff --git a/plat/arm/rdinfra/rdn1edge/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
similarity index 82%
copy from plat/arm/rdinfra/rdn1edge/include/platform_def.h
copy to plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
index 0ae8ec5..6360031 100644
--- a/plat/arm/rdinfra/rdn1edge/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,7 +7,7 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
-#include "sgi_soc_platform_def.h"
+#include "nrd_soc_platform_def.h"
#define PLAT_ARM_CLUSTER_COUNT U(2)
#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4)
diff --git a/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk b/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk
new file mode 100644
index 0000000..3752416
--- /dev/null
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/neoverse_rd/common/nrd_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/neoverse_rd/platform/rdn1edge/include/
+
+PLAT_SOURCES += plat/arm/neoverse_rd/platform/rdn1edge/topology.c
+
+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}.")
+endif
diff --git a/plat/arm/rdinfra/rdn1edge/tests_to_skip.txt b/plat/arm/neoverse_rd/platform/rdn1edge/tests_to_skip.txt
similarity index 78%
rename from plat/arm/rdinfra/rdn1edge/tests_to_skip.txt
rename to plat/arm/neoverse_rd/platform/rdn1edge/tests_to_skip.txt
index 95360bc..6341809 100644
--- a/plat/arm/rdinfra/rdn1edge/tests_to_skip.txt
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/tests_to_skip.txt
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
diff --git a/plat/arm/rdinfra/rdn1edge/topology.c b/plat/arm/neoverse_rd/platform/rdn1edge/topology.c
similarity index 93%
rename from plat/arm/rdinfra/rdn1edge/topology.c
rename to plat/arm/neoverse_rd/platform/rdn1edge/topology.c
index 6f20695..978a309 100644
--- a/plat/arm/rdinfra/rdn1edge/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
diff --git a/plat/arm/rdinfra/rdn2/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
similarity index 89%
rename from plat/arm/rdinfra/rdn2/include/platform_def.h
rename to plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
index ab4149d..4523653 100644
--- a/plat/arm/rdinfra/rdn2/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,7 +7,7 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
-#include <sgi_soc_platform_def_v2.h>
+#include <nrd_soc_platform_def_v2.h>
/*
* The RD-N2 Cfg1 platform is a variant of the RD-N2 platform with a
diff --git a/plat/arm/neoverse_rd/platform/rdn2/platform.mk b/plat/arm/neoverse_rd/platform/rdn2/platform.mk
new file mode 100644
index 0000000..d79af3e
--- /dev/null
+++ b/plat/arm/neoverse_rd/platform/rdn2/platform.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/neoverse_rd/common/nrd_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/neoverse_rd/platform/rdn2/include/
+
+PLAT_SOURCES += plat/arm/neoverse_rd/platform/rdn2/topology.c
+
+PLAT_TESTS_SKIP_LIST := plat/arm/neoverse_rd/platform/rdn2/tests_to_skip.txt
+
+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}.")
+endif
diff --git a/plat/arm/rdinfra/rdn2/tests_to_skip.txt b/plat/arm/neoverse_rd/platform/rdn2/tests_to_skip.txt
similarity index 84%
rename from plat/arm/rdinfra/rdn2/tests_to_skip.txt
rename to plat/arm/neoverse_rd/platform/rdn2/tests_to_skip.txt
index b8a433d..2c9acee 100644
--- a/plat/arm/rdinfra/rdn2/tests_to_skip.txt
+++ b/plat/arm/neoverse_rd/platform/rdn2/tests_to_skip.txt
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
diff --git a/plat/arm/rdinfra/rdn2/topology.c b/plat/arm/neoverse_rd/platform/rdn2/topology.c
similarity index 96%
rename from plat/arm/rdinfra/rdn2/topology.c
rename to plat/arm/neoverse_rd/platform/rdn2/topology.c
index 6918638..b98f302 100644
--- a/plat/arm/rdinfra/rdn2/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdn2/topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
diff --git a/plat/arm/rdinfra/rdv1/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
similarity index 82%
rename from plat/arm/rdinfra/rdv1/include/platform_def.h
rename to plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
index 7869551..1073feb 100644
--- a/plat/arm/rdinfra/rdv1/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,7 +7,7 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
-#include <sgi_soc_platform_def.h>
+#include <nrd_soc_platform_def.h>
#define PLAT_ARM_CLUSTER_COUNT U(16)
#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1)
diff --git a/plat/arm/neoverse_rd/platform/rdv1/platform.mk b/plat/arm/neoverse_rd/platform/rdv1/platform.mk
new file mode 100644
index 0000000..453c9da
--- /dev/null
+++ b/plat/arm/neoverse_rd/platform/rdv1/platform.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/neoverse_rd/common/nrd_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/neoverse_rd/platform/rdv1/include/
+
+PLAT_SOURCES += plat/arm/neoverse_rd/platform/rdv1/topology.c
+
+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}.")
+endif
diff --git a/plat/arm/rdinfra/rdv1/tests_to_skip.txt b/plat/arm/neoverse_rd/platform/rdv1/tests_to_skip.txt
similarity index 89%
rename from plat/arm/rdinfra/rdv1/tests_to_skip.txt
rename to plat/arm/neoverse_rd/platform/rdv1/tests_to_skip.txt
index 9b3ff5f..d62b9dd 100644
--- a/plat/arm/rdinfra/rdv1/tests_to_skip.txt
+++ b/plat/arm/neoverse_rd/platform/rdv1/tests_to_skip.txt
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
diff --git a/plat/arm/rdinfra/rdv1/topology.c b/plat/arm/neoverse_rd/platform/rdv1/topology.c
similarity index 96%
rename from plat/arm/rdinfra/rdv1/topology.c
rename to plat/arm/neoverse_rd/platform/rdv1/topology.c
index ad13285..8bc20ff 100644
--- a/plat/arm/rdinfra/rdv1/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdv1/topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
diff --git a/plat/arm/rdinfra/rdn1edge/include/platform_def.h b/plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
similarity index 82%
rename from plat/arm/rdinfra/rdn1edge/include/platform_def.h
rename to plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
index 0ae8ec5..18887ab 100644
--- a/plat/arm/rdinfra/rdn1edge/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,7 +7,7 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
-#include "sgi_soc_platform_def.h"
+#include <nrd_soc_platform_def.h>
#define PLAT_ARM_CLUSTER_COUNT U(2)
#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4)
diff --git a/plat/arm/neoverse_rd/platform/sgi575/platform.mk b/plat/arm/neoverse_rd/platform/sgi575/platform.mk
new file mode 100644
index 0000000..a83aeaf
--- /dev/null
+++ b/plat/arm/neoverse_rd/platform/sgi575/platform.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/neoverse_rd/common/nrd_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/neoverse_rd/platform/sgi575/include/
+
+PLAT_SOURCES += plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
+
+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}.")
+endif
diff --git a/plat/arm/sgi/sgi575/sgi575_topology.c b/plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
similarity index 93%
rename from plat/arm/sgi/sgi575/sgi575_topology.c
rename to plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
index c01ad83..b9c25ba 100644
--- a/plat/arm/sgi/sgi575/sgi575_topology.c
+++ b/plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
diff --git a/plat/arm/sgi/sgi575/tests_to_skip.txt b/plat/arm/neoverse_rd/platform/sgi575/tests_to_skip.txt
similarity index 78%
rename from plat/arm/sgi/sgi575/tests_to_skip.txt
rename to plat/arm/neoverse_rd/platform/sgi575/tests_to_skip.txt
index 1af24d8..8817946 100644
--- a/plat/arm/sgi/sgi575/tests_to_skip.txt
+++ b/plat/arm/neoverse_rd/platform/sgi575/tests_to_skip.txt
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
diff --git a/plat/arm/rdinfra/rdn1edge/platform.mk b/plat/arm/rdinfra/rdn1edge/platform.mk
deleted file mode 100644
index d44e5a0..0000000
--- a/plat/arm/rdinfra/rdn1edge/platform.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/rdinfra/rdn1edge/include/
-
-PLAT_SOURCES += plat/arm/rdinfra/rdn1edge/topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/rdinfra/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}.")
-endif
diff --git a/plat/arm/rdinfra/rdn2/platform.mk b/plat/arm/rdinfra/rdn2/platform.mk
deleted file mode 100644
index 3d4ffe6..0000000
--- a/plat/arm/rdinfra/rdn2/platform.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/rdinfra/rdn2/include/
-
-PLAT_SOURCES += plat/arm/rdinfra/rdn2/topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/rdinfra/rdn2/tests_to_skip.txt
-
-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}.")
-endif
diff --git a/plat/arm/rdinfra/rdv1/platform.mk b/plat/arm/rdinfra/rdv1/platform.mk
deleted file mode 100644
index 8001ec5..0000000
--- a/plat/arm/rdinfra/rdv1/platform.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/rdinfra/rdv1/include/
-
-PLAT_SOURCES += plat/arm/rdinfra/rdv1/topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/rdinfra/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}.")
-endif
diff --git a/plat/arm/sgi/common/include/sgi_soc_css_def_v2.h b/plat/arm/sgi/common/include/sgi_soc_css_def_v2.h
deleted file mode 100644
index e834386..0000000
--- a/plat/arm/sgi/common/include/sgi_soc_css_def_v2.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef SGI_SOC_CSS_DEF_V2_H
-#define SGI_SOC_CSS_DEF_V2_H
-
-/* Trusted watchdog (SP805) Interrupt ID */
-#define IRQ_TWDOG_INTID 107
-
-/* Maximum SPI */
-#define PLAT_MAX_SPI_OFFSET_ID 256
-
-/* AP_REFCLK Generic Timer, Non-secure. */
-#define IRQ_CNTPSIRQ1 109
-
-#endif /* SGI_SOC_CSS_DEF_V2_H */
-
diff --git a/plat/arm/sgi/common/include/sgi_soc_platform_def.h b/plat/arm/sgi/common/include/sgi_soc_platform_def.h
deleted file mode 100644
index fc60999..0000000
--- a/plat/arm/sgi/common/include/sgi_soc_platform_def.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2022, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef SGI_SOC_PLATFORM_H
-#define SGI_SOC_PLATFORM_H
-
-#include <sgi_base_platform_def.h>
-#include <sgi_soc_css_def.h>
-
-/* Base address of non-trusted watchdog (SP805) */
-#define SP805_WDOG_BASE UL(0x1C0F0000)
-
-#endif /* SGI_SOC_PLATFORM_H */
diff --git a/plat/arm/sgi/common/include/sgi_soc_platform_def_v2.h b/plat/arm/sgi/common/include/sgi_soc_platform_def_v2.h
deleted file mode 100644
index fad31ca..0000000
--- a/plat/arm/sgi/common/include/sgi_soc_platform_def_v2.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2022, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef SGI_SOC_PLATFORM_V2_H
-#define SGI_SOC_PLATFORM_V2_H
-
-#include <sgi_base_platform_def.h>
-#include <sgi_soc_css_def_v2.h>
-
-/* Base address of non-trusted watchdog (SP805) */
-#define SP805_WDOG_BASE UL(0x0C0F0000)
-
-#endif /* SGI_SOC_PLATFORM_V2_H */
diff --git a/plat/arm/sgi/sgi575/include/platform_def.h b/plat/arm/sgi/sgi575/include/platform_def.h
deleted file mode 100644
index 237978c..0000000
--- a/plat/arm/sgi/sgi575/include/platform_def.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef PLATFORM_DEF_H
-#define PLATFORM_DEF_H
-
-#include <sgi_soc_platform_def.h>
-
-#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)
-
-/* 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/platform.mk b/plat/arm/sgi/sgi575/platform.mk
deleted file mode 100644
index 7c8194f..0000000
--- a/plat/arm/sgi/sgi575/platform.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2018-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/sgi/sgi575/include/
-
-PLAT_SOURCES += plat/arm/sgi/sgi575/sgi575_topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/sgi/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}.")
-endif