diff --git a/docs/about/maintainers.rst b/docs/about/maintainers.rst index 37640842c..3a620af05 100644 --- a/docs/about/maintainers.rst +++ b/docs/about/maintainers.rst @@ -524,12 +524,12 @@ Arm Reference Design platform ports :|G|: `thomas-arm`_ :|M|: Vijayenthiran Subramaniam :|G|: `vijayenthiran-arm`_ -:|F|: plat/arm/css/neoverse_rd/ -:|F|: plat/arm/board/rdn1edge/ -:|F|: plat/arm/board/rdn2/ -:|F|: plat/arm/board/rdv1/ -:|F|: plat/arm/board/rdv1mc/ -:|F|: plat/arm/board/sgi575/ +:|F|: plat/arm/board/neoverse_rd/common +:|F|: plat/arm/board/neoverse_rd/platform/rdn1edge/ +:|F|: plat/arm/board/neoverse_rd/platform/rdn2/ +:|F|: plat/arm/board/neoverse_rd/platform/rdv1/ +:|F|: plat/arm/board/neoverse_rd/platform/rdv1mc/ +:|F|: plat/arm/board/neoverse_rd/platform/sgi575/ Arm Total Compute platform port ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/plat/arm/css/neoverse_rd/aarch64/nrd_helper.S b/plat/arm/board/neoverse_rd/common/arch/aarch64/nrd_helper.S similarity index 100% rename from plat/arm/css/neoverse_rd/aarch64/nrd_helper.S rename to plat/arm/board/neoverse_rd/common/arch/aarch64/nrd_helper.S diff --git a/plat/arm/css/neoverse_rd/include/nrd_base_platform_def.h b/plat/arm/board/neoverse_rd/common/include/nrd_base_platform_def.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_base_platform_def.h rename to plat/arm/board/neoverse_rd/common/include/nrd_base_platform_def.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_dmc620_tzc_regions.h b/plat/arm/board/neoverse_rd/common/include/nrd_dmc620_tzc_regions.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_dmc620_tzc_regions.h rename to plat/arm/board/neoverse_rd/common/include/nrd_dmc620_tzc_regions.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_plat.h b/plat/arm/board/neoverse_rd/common/include/nrd_plat.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_plat.h rename to plat/arm/board/neoverse_rd/common/include/nrd_plat.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_ras.h b/plat/arm/board/neoverse_rd/common/include/nrd_ras.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_ras.h rename to plat/arm/board/neoverse_rd/common/include/nrd_ras.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_sdei.h b/plat/arm/board/neoverse_rd/common/include/nrd_sdei.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_sdei.h rename to plat/arm/board/neoverse_rd/common/include/nrd_sdei.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_soc_css_def.h b/plat/arm/board/neoverse_rd/common/include/nrd_soc_css_def.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_soc_css_def.h rename to plat/arm/board/neoverse_rd/common/include/nrd_soc_css_def.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_soc_css_def_v2.h b/plat/arm/board/neoverse_rd/common/include/nrd_soc_css_def_v2.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_soc_css_def_v2.h rename to plat/arm/board/neoverse_rd/common/include/nrd_soc_css_def_v2.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_soc_platform_def.h b/plat/arm/board/neoverse_rd/common/include/nrd_soc_platform_def.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_soc_platform_def.h rename to plat/arm/board/neoverse_rd/common/include/nrd_soc_platform_def.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_soc_platform_def_v2.h b/plat/arm/board/neoverse_rd/common/include/nrd_soc_platform_def_v2.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_soc_platform_def_v2.h rename to plat/arm/board/neoverse_rd/common/include/nrd_soc_platform_def_v2.h diff --git a/plat/arm/css/neoverse_rd/include/nrd_variant.h b/plat/arm/board/neoverse_rd/common/include/nrd_variant.h similarity index 100% rename from plat/arm/css/neoverse_rd/include/nrd_variant.h rename to plat/arm/board/neoverse_rd/common/include/nrd_variant.h diff --git a/plat/arm/css/neoverse_rd/include/plat_macros.S b/plat/arm/board/neoverse_rd/common/include/plat_macros.S similarity index 100% rename from plat/arm/css/neoverse_rd/include/plat_macros.S rename to plat/arm/board/neoverse_rd/common/include/plat_macros.S diff --git a/plat/arm/css/neoverse_rd/nrd-common.mk b/plat/arm/board/neoverse_rd/common/nrd-common.mk similarity index 81% rename from plat/arm/css/neoverse_rd/nrd-common.mk rename to plat/arm/board/neoverse_rd/common/nrd-common.mk index 18769ef21..33da19cda 100644 --- a/plat/arm/css/neoverse_rd/nrd-common.mk +++ b/plat/arm/board/neoverse_rd/common/nrd-common.mk @@ -6,7 +6,7 @@ CSS_USE_SCMI_SDS_DRIVER := 1 -CSS_ENT_BASE := plat/arm/css/neoverse_rd +NRD_COMMON_BASE := plat/arm/board/neoverse_rd/common ENABLE_FEAT_RAS := 1 @@ -25,9 +25,9 @@ ENABLE_SVE_FOR_NS := 0 CTX_INCLUDE_FPREGS := 1 -INTERCONNECT_SOURCES := ${CSS_ENT_BASE}/nrd_interconnect.c +INTERCONNECT_SOURCES := ${NRD_COMMON_BASE}/nrd_interconnect.c -PLAT_INCLUDES += -I${CSS_ENT_BASE}/include +PLAT_INCLUDES += -I${NRD_COMMON_BASE}/include # GIC-600 configuration GICV3_SUPPORT_GIC600 := 1 @@ -39,18 +39,18 @@ ENT_GIC_SOURCES := ${GICV3_SOURCES} \ plat/common/plat_gicv3.c \ plat/arm/common/arm_gicv3.c -PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/aarch64/nrd_helper.S +PLAT_BL_COMMON_SOURCES += ${NRD_COMMON_BASE}/arch/aarch64/nrd_helper.S BL1_SOURCES += ${INTERCONNECT_SOURCES} \ drivers/arm/sbsa/sbsa.c -BL2_SOURCES += ${CSS_ENT_BASE}/nrd_image_load.c \ +BL2_SOURCES += ${NRD_COMMON_BASE}/nrd_image_load.c \ drivers/arm/css/sds/sds.c BL31_SOURCES += ${INTERCONNECT_SOURCES} \ ${ENT_GIC_SOURCES} \ - ${CSS_ENT_BASE}/nrd_bl31_setup.c \ - ${CSS_ENT_BASE}/nrd_topology.c \ + ${NRD_COMMON_BASE}/nrd_bl31_setup.c \ + ${NRD_COMMON_BASE}/nrd_topology.c \ drivers/delay_timer/generic_delay_timer.c ifneq (${RESET_TO_BL31},0) diff --git a/plat/arm/css/neoverse_rd/nrd_bl31_setup.c b/plat/arm/board/neoverse_rd/common/nrd_bl31_setup.c similarity index 100% rename from plat/arm/css/neoverse_rd/nrd_bl31_setup.c rename to plat/arm/board/neoverse_rd/common/nrd_bl31_setup.c diff --git a/plat/arm/css/neoverse_rd/nrd_image_load.c b/plat/arm/board/neoverse_rd/common/nrd_image_load.c similarity index 100% rename from plat/arm/css/neoverse_rd/nrd_image_load.c rename to plat/arm/board/neoverse_rd/common/nrd_image_load.c diff --git a/plat/arm/css/neoverse_rd/nrd_interconnect.c b/plat/arm/board/neoverse_rd/common/nrd_interconnect.c similarity index 100% rename from plat/arm/css/neoverse_rd/nrd_interconnect.c rename to plat/arm/board/neoverse_rd/common/nrd_interconnect.c diff --git a/plat/arm/css/neoverse_rd/nrd_plat.c b/plat/arm/board/neoverse_rd/common/nrd_plat.c similarity index 100% rename from plat/arm/css/neoverse_rd/nrd_plat.c rename to plat/arm/board/neoverse_rd/common/nrd_plat.c diff --git a/plat/arm/css/neoverse_rd/nrd_plat_v2.c b/plat/arm/board/neoverse_rd/common/nrd_plat_v2.c similarity index 100% rename from plat/arm/css/neoverse_rd/nrd_plat_v2.c rename to plat/arm/board/neoverse_rd/common/nrd_plat_v2.c diff --git a/plat/arm/css/neoverse_rd/nrd_topology.c b/plat/arm/board/neoverse_rd/common/nrd_topology.c similarity index 100% rename from plat/arm/css/neoverse_rd/nrd_topology.c rename to plat/arm/board/neoverse_rd/common/nrd_topology.c diff --git a/plat/arm/css/neoverse_rd/ras/nrd_ras_common.c b/plat/arm/board/neoverse_rd/common/ras/nrd_ras_common.c similarity index 100% rename from plat/arm/css/neoverse_rd/ras/nrd_ras_common.c rename to plat/arm/board/neoverse_rd/common/ras/nrd_ras_common.c diff --git a/plat/arm/css/neoverse_rd/ras/nrd_ras_cpu.c b/plat/arm/board/neoverse_rd/common/ras/nrd_ras_cpu.c similarity index 100% rename from plat/arm/css/neoverse_rd/ras/nrd_ras_cpu.c rename to plat/arm/board/neoverse_rd/common/ras/nrd_ras_cpu.c diff --git a/plat/arm/css/neoverse_rd/ras/nrd_ras_sram.c b/plat/arm/board/neoverse_rd/common/ras/nrd_ras_sram.c similarity index 100% rename from plat/arm/css/neoverse_rd/ras/nrd_ras_sram.c rename to plat/arm/board/neoverse_rd/common/ras/nrd_ras_sram.c diff --git a/plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_fw_config.dts similarity index 86% rename from plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_fw_config.dts index d3b7fba49..085a42a51 100644 --- a/plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, ARM Limited and Contributors. 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/board/rdn1edge/fdts/rdn1edge_nt_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_nt_fw_config.dts similarity index 86% rename from plat/arm/board/rdn1edge/fdts/rdn1edge_nt_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_nt_fw_config.dts index 68366c5ca..3cef0d150 100644 --- a/plat/arm/board/rdn1edge/fdts/rdn1edge_nt_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_nt_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, ARM Limited and Contributors. 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/board/rdn1edge/fdts/rdn1edge_tb_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_tb_fw_config.dts similarity index 89% rename from plat/arm/board/rdn1edge/fdts/rdn1edge_tb_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_tb_fw_config.dts index 257ef4a3f..78cd5a820 100644 --- a/plat/arm/board/rdn1edge/fdts/rdn1edge_tb_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdn1edge/fdts/rdn1edge_tb_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdn1edge/include/platform_def.h b/plat/arm/board/neoverse_rd/platform/rdn1edge/include/platform_def.h similarity index 100% rename from plat/arm/board/rdn1edge/include/platform_def.h rename to plat/arm/board/neoverse_rd/platform/rdn1edge/include/platform_def.h diff --git a/plat/arm/board/rdn1edge/platform.mk b/plat/arm/board/neoverse_rd/platform/rdn1edge/platform.mk similarity index 93% rename from plat/arm/board/rdn1edge/platform.mk rename to plat/arm/board/neoverse_rd/platform/rdn1edge/platform.mk index b440ae093..140835180 100644 --- a/plat/arm/board/rdn1edge/platform.mk +++ b/plat/arm/board/neoverse_rd/platform/rdn1edge/platform.mk @@ -9,15 +9,15 @@ $(warning Platform ${PLAT} is deprecated. Some of the features might not work as # GIC-600 configuration GICV3_IMPL_GIC600_MULTICHIP := 1 -include plat/arm/css/neoverse_rd/nrd-common.mk +include plat/arm/board/neoverse_rd/common/nrd-common.mk -RDN1EDGE_BASE = plat/arm/board/rdn1edge +RDN1EDGE_BASE = plat/arm/board/neoverse_rd/platform/rdn1edge PLAT_INCLUDES += -I${RDN1EDGE_BASE}/include/ SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n1.S -PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat.c +PLAT_BL_COMMON_SOURCES += ${NRD_COMMON_BASE}/nrd_plat.c BL1_SOURCES += ${SGI_CPU_SOURCES} \ ${RDN1EDGE_BASE}/rdn1edge_err.c diff --git a/plat/arm/board/rdn1edge/rdn1edge_err.c b/plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_err.c similarity index 71% rename from plat/arm/board/rdn1edge/rdn1edge_err.c rename to plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_err.c index 46d318c7b..273e1f45c 100644 --- a/plat/arm/board/rdn1edge/rdn1edge_err.c +++ b/plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_err.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, 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/board/rdn1edge/rdn1edge_plat.c b/plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_plat.c similarity index 100% rename from plat/arm/board/rdn1edge/rdn1edge_plat.c rename to plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_plat.c diff --git a/plat/arm/board/rdn1edge/rdn1edge_security.c b/plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_security.c similarity index 100% rename from plat/arm/board/rdn1edge/rdn1edge_security.c rename to plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_security.c diff --git a/plat/arm/board/rdn1edge/rdn1edge_topology.c b/plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_topology.c similarity index 97% rename from plat/arm/board/rdn1edge/rdn1edge_topology.c rename to plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_topology.c index 5bbea6998..6c527448e 100644 --- a/plat/arm/board/rdn1edge/rdn1edge_topology.c +++ b/plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_topology.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, ARM Limited and Contributors. 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/board/rdn1edge/rdn1edge_trusted_boot.c b/plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_trusted_boot.c similarity index 88% rename from plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c rename to plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_trusted_boot.c index 4592b8fba..84622d004 100644 --- a/plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c +++ b/plat/arm/board/neoverse_rd/platform/rdn1edge/rdn1edge_trusted_boot.c @@ -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/board/rdn2/fdts/rdn2_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_fw_config.dts similarity index 100% rename from plat/arm/board/rdn2/fdts/rdn2_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_fw_config.dts diff --git a/plat/arm/board/rdn2/fdts/rdn2_nt_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_nt_fw_config.dts similarity index 90% rename from plat/arm/board/rdn2/fdts/rdn2_nt_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_nt_fw_config.dts index dd70141de..8e5856560 100644 --- a/plat/arm/board/rdn2/fdts/rdn2_nt_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_nt_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 - 2022, ARM Limited and Contributors. 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/board/rdn2/fdts/rdn2_stmm_sel0_manifest.dts b/plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_stmm_sel0_manifest.dts similarity index 97% rename from plat/arm/board/rdn2/fdts/rdn2_stmm_sel0_manifest.dts rename to plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_stmm_sel0_manifest.dts index 611970672..dbdc7e597 100644 --- a/plat/arm/board/rdn2/fdts/rdn2_stmm_sel0_manifest.dts +++ b/plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_stmm_sel0_manifest.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/arm/board/rdn2/fdts/rdn2_tb_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_tb_fw_config.dts similarity index 89% rename from plat/arm/board/rdn2/fdts/rdn2_tb_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_tb_fw_config.dts index 49eda2735..c370623bb 100644 --- a/plat/arm/board/rdn2/fdts/rdn2_tb_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdn2/fdts/rdn2_tb_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdn2/include/platform_def.h b/plat/arm/board/neoverse_rd/platform/rdn2/include/platform_def.h similarity index 100% rename from plat/arm/board/rdn2/include/platform_def.h rename to plat/arm/board/neoverse_rd/platform/rdn2/include/platform_def.h diff --git a/plat/arm/board/rdn2/include/rdn2_ras.h b/plat/arm/board/neoverse_rd/platform/rdn2/include/rdn2_ras.h similarity index 100% rename from plat/arm/board/rdn2/include/rdn2_ras.h rename to plat/arm/board/neoverse_rd/platform/rdn2/include/rdn2_ras.h diff --git a/plat/arm/board/rdn2/platform.mk b/plat/arm/board/neoverse_rd/platform/rdn2/platform.mk similarity index 92% rename from plat/arm/board/rdn2/platform.mk rename to plat/arm/board/neoverse_rd/platform/rdn2/platform.mk index 6476899db..fb9ff3511 100644 --- a/plat/arm/board/rdn2/platform.mk +++ b/plat/arm/board/neoverse_rd/platform/rdn2/platform.mk @@ -28,16 +28,16 @@ endif override CSS_SYSTEM_GRACEFUL_RESET := 1 override EL3_EXCEPTION_HANDLING := 1 -include plat/arm/css/neoverse_rd/nrd-common.mk +include plat/arm/board/neoverse_rd/common/nrd-common.mk -RDN2_BASE = plat/arm/board/rdn2 +RDN2_BASE = plat/arm/board/neoverse_rd/platform/rdn2 PLAT_INCLUDES += -I${RDN2_BASE}/include/ SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n2.S \ lib/cpus/aarch64/neoverse_v2.S -PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat_v2.c +PLAT_BL_COMMON_SOURCES += ${NRD_COMMON_BASE}/nrd_plat_v2.c BL1_SOURCES += ${SGI_CPU_SOURCES} \ ${RDN2_BASE}/rdn2_err.c @@ -71,9 +71,9 @@ endif ifeq (${ENABLE_FEAT_RAS}-${HANDLE_EA_EL3_FIRST_NS},1-1) BL31_SOURCES += ${RDN2_BASE}/rdn2_ras.c \ - ${CSS_ENT_BASE}/ras/nrd_ras_common.c \ - ${CSS_ENT_BASE}/ras/nrd_ras_sram.c \ - ${CSS_ENT_BASE}/ras/nrd_ras_cpu.c + ${NRD_COMMON_BASE}/ras/nrd_ras_common.c \ + ${NRD_COMMON_BASE}/ras/nrd_ras_sram.c \ + ${NRD_COMMON_BASE}/ras/nrd_ras_cpu.c endif # Add the FDT_SOURCES and options for Dynamic Config diff --git a/plat/arm/board/rdn2/rdn2_err.c b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_err.c similarity index 71% rename from plat/arm/board/rdn2/rdn2_err.c rename to plat/arm/board/neoverse_rd/platform/rdn2/rdn2_err.c index 802ac21f6..d7126454e 100644 --- a/plat/arm/board/rdn2/rdn2_err.c +++ b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_err.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdn2/rdn2_plat.c b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_plat.c similarity index 100% rename from plat/arm/board/rdn2/rdn2_plat.c rename to plat/arm/board/neoverse_rd/platform/rdn2/rdn2_plat.c diff --git a/plat/arm/board/rdn2/rdn2_ras.c b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_ras.c similarity index 100% rename from plat/arm/board/rdn2/rdn2_ras.c rename to plat/arm/board/neoverse_rd/platform/rdn2/rdn2_ras.c diff --git a/plat/arm/board/rdn2/rdn2_security.c b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_security.c similarity index 96% rename from plat/arm/board/rdn2/rdn2_security.c rename to plat/arm/board/neoverse_rd/platform/rdn2/rdn2_security.c index 7cd4a1c81..4ff6ac090 100644 --- a/plat/arm/board/rdn2/rdn2_security.c +++ b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_security.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, ARM Limited and Contributors. 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/board/rdn2/rdn2_topology.c b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_topology.c similarity index 98% rename from plat/arm/board/rdn2/rdn2_topology.c rename to plat/arm/board/neoverse_rd/platform/rdn2/rdn2_topology.c index 24acc4d81..41200edc4 100644 --- a/plat/arm/board/rdn2/rdn2_topology.c +++ b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_topology.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, ARM Limited and Contributors. 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/board/rdn2/rdn2_trusted_boot.c b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_trusted_boot.c similarity index 88% rename from plat/arm/board/rdn2/rdn2_trusted_boot.c rename to plat/arm/board/neoverse_rd/platform/rdn2/rdn2_trusted_boot.c index 4592b8fba..84622d004 100644 --- a/plat/arm/board/rdn2/rdn2_trusted_boot.c +++ b/plat/arm/board/neoverse_rd/platform/rdn2/rdn2_trusted_boot.c @@ -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/board/rdv1/fdts/rdv1_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_fw_config.dts similarity index 83% rename from plat/arm/board/rdv1/fdts/rdv1_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_fw_config.dts index 9c9cefe87..d44344377 100644 --- a/plat/arm/board/rdv1/fdts/rdv1_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1/fdts/rdv1_nt_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_nt_fw_config.dts similarity index 83% rename from plat/arm/board/rdv1/fdts/rdv1_nt_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_nt_fw_config.dts index 62ba2c3f2..fb0888545 100644 --- a/plat/arm/board/rdv1/fdts/rdv1_nt_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_nt_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1/fdts/rdv1_tb_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_tb_fw_config.dts similarity index 89% rename from plat/arm/board/rdv1/fdts/rdv1_tb_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_tb_fw_config.dts index 49eda2735..c370623bb 100644 --- a/plat/arm/board/rdv1/fdts/rdv1_tb_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdv1/fdts/rdv1_tb_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1/include/platform_def.h b/plat/arm/board/neoverse_rd/platform/rdv1/include/platform_def.h similarity index 100% rename from plat/arm/board/rdv1/include/platform_def.h rename to plat/arm/board/neoverse_rd/platform/rdv1/include/platform_def.h diff --git a/plat/arm/board/rdv1/platform.mk b/plat/arm/board/neoverse_rd/platform/rdv1/platform.mk similarity index 92% rename from plat/arm/board/rdv1/platform.mk rename to plat/arm/board/neoverse_rd/platform/rdv1/platform.mk index 9858e3127..60066198d 100644 --- a/plat/arm/board/rdv1/platform.mk +++ b/plat/arm/board/neoverse_rd/platform/rdv1/platform.mk @@ -6,15 +6,15 @@ # RD-V1 platform uses GIC-700 which is based on GICv4.1 GIC_ENABLE_V4_EXTN := 1 -include plat/arm/css/neoverse_rd/nrd-common.mk +include plat/arm/board/neoverse_rd/common/nrd-common.mk -RDV1_BASE = plat/arm/board/rdv1 +RDV1_BASE = plat/arm/board/neoverse_rd/platform/rdv1 PLAT_INCLUDES += -I${RDV1_BASE}/include/ SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_v1.S -PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat.c +PLAT_BL_COMMON_SOURCES += ${NRD_COMMON_BASE}/nrd_plat.c BL1_SOURCES += ${SGI_CPU_SOURCES} \ ${RDV1_BASE}/rdv1_err.c diff --git a/plat/arm/board/rdv1/rdv1_err.c b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_err.c similarity index 71% rename from plat/arm/board/rdv1/rdv1_err.c rename to plat/arm/board/neoverse_rd/platform/rdv1/rdv1_err.c index 68f9a3ef6..d75f525c5 100644 --- a/plat/arm/board/rdv1/rdv1_err.c +++ b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_err.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1/rdv1_plat.c b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_plat.c similarity index 100% rename from plat/arm/board/rdv1/rdv1_plat.c rename to plat/arm/board/neoverse_rd/platform/rdv1/rdv1_plat.c diff --git a/plat/arm/board/rdv1/rdv1_security.c b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_security.c similarity index 82% rename from plat/arm/board/rdv1/rdv1_security.c rename to plat/arm/board/neoverse_rd/platform/rdv1/rdv1_security.c index 1247db860..a936a71bb 100644 --- a/plat/arm/board/rdv1/rdv1_security.c +++ b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_security.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1/rdv1_topology.c b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_topology.c similarity index 96% rename from plat/arm/board/rdv1/rdv1_topology.c rename to plat/arm/board/neoverse_rd/platform/rdv1/rdv1_topology.c index ab64fd8d0..5ae20dd75 100644 --- a/plat/arm/board/rdv1/rdv1_topology.c +++ b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_topology.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1/rdv1_trusted_boot.c b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_trusted_boot.c similarity index 88% rename from plat/arm/board/rdv1/rdv1_trusted_boot.c rename to plat/arm/board/neoverse_rd/platform/rdv1/rdv1_trusted_boot.c index 4592b8fba..84622d004 100644 --- a/plat/arm/board/rdv1/rdv1_trusted_boot.c +++ b/plat/arm/board/neoverse_rd/platform/rdv1/rdv1_trusted_boot.c @@ -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/board/rdv1mc/fdts/rdv1mc_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_fw_config.dts similarity index 83% rename from plat/arm/board/rdv1mc/fdts/rdv1mc_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_fw_config.dts index 9c9cefe87..d44344377 100644 --- a/plat/arm/board/rdv1mc/fdts/rdv1mc_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1mc/fdts/rdv1mc_nt_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_nt_fw_config.dts similarity index 83% rename from plat/arm/board/rdv1mc/fdts/rdv1mc_nt_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_nt_fw_config.dts index 71c7db3cb..78fa31e15 100644 --- a/plat/arm/board/rdv1mc/fdts/rdv1mc_nt_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_nt_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1mc/fdts/rdv1mc_tb_fw_config.dts b/plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_tb_fw_config.dts similarity index 89% rename from plat/arm/board/rdv1mc/fdts/rdv1mc_tb_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_tb_fw_config.dts index 49eda2735..c370623bb 100644 --- a/plat/arm/board/rdv1mc/fdts/rdv1mc_tb_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/rdv1mc/fdts/rdv1mc_tb_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1mc/include/platform_def.h b/plat/arm/board/neoverse_rd/platform/rdv1mc/include/platform_def.h similarity index 100% rename from plat/arm/board/rdv1mc/include/platform_def.h rename to plat/arm/board/neoverse_rd/platform/rdv1mc/include/platform_def.h diff --git a/plat/arm/board/rdv1mc/platform.mk b/plat/arm/board/neoverse_rd/platform/rdv1mc/platform.mk similarity index 93% rename from plat/arm/board/rdv1mc/platform.mk rename to plat/arm/board/neoverse_rd/platform/rdv1mc/platform.mk index a4d807d8a..2ce9fa597 100644 --- a/plat/arm/board/rdv1mc/platform.mk +++ b/plat/arm/board/neoverse_rd/platform/rdv1mc/platform.mk @@ -7,15 +7,15 @@ GIC_ENABLE_V4_EXTN := 1 GICV3_IMPL_GIC600_MULTICHIP := 1 -include plat/arm/css/neoverse_rd/nrd-common.mk +include plat/arm/board/neoverse_rd/common/nrd-common.mk -RDV1MC_BASE = plat/arm/board/rdv1mc +RDV1MC_BASE = plat/arm/board/neoverse_rd/platform/rdv1mc PLAT_INCLUDES += -I${RDV1MC_BASE}/include/ SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_v1.S -PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat.c +PLAT_BL_COMMON_SOURCES += ${NRD_COMMON_BASE}/nrd_plat.c BL1_SOURCES += ${SGI_CPU_SOURCES} \ ${RDV1MC_BASE}/rdv1mc_err.c diff --git a/plat/arm/board/rdv1mc/rdv1mc_err.c b/plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_err.c similarity index 71% rename from plat/arm/board/rdv1mc/rdv1mc_err.c rename to plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_err.c index 755a5034e..b855edd7f 100644 --- a/plat/arm/board/rdv1mc/rdv1mc_err.c +++ b/plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_err.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/rdv1mc/rdv1mc_plat.c b/plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_plat.c similarity index 100% rename from plat/arm/board/rdv1mc/rdv1mc_plat.c rename to plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_plat.c diff --git a/plat/arm/board/rdv1mc/rdv1mc_security.c b/plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_security.c similarity index 95% rename from plat/arm/board/rdv1mc/rdv1mc_security.c rename to plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_security.c index adc0bf816..8cae53c6e 100644 --- a/plat/arm/board/rdv1mc/rdv1mc_security.c +++ b/plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_security.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, ARM Limited and Contributors. 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/board/rdv1mc/rdv1mc_topology.c b/plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_topology.c similarity index 100% rename from plat/arm/board/rdv1mc/rdv1mc_topology.c rename to plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_topology.c diff --git a/plat/arm/board/rdv1mc/rdv1mc_trusted_boot.c b/plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_trusted_boot.c similarity index 88% rename from plat/arm/board/rdv1mc/rdv1mc_trusted_boot.c rename to plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_trusted_boot.c index 4592b8fba..84622d004 100644 --- a/plat/arm/board/rdv1mc/rdv1mc_trusted_boot.c +++ b/plat/arm/board/neoverse_rd/platform/rdv1mc/rdv1mc_trusted_boot.c @@ -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/board/sgi575/fdts/sgi575_fw_config.dts b/plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_fw_config.dts similarity index 86% rename from plat/arm/board/sgi575/fdts/sgi575_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_fw_config.dts index 84fc1ad5f..fe62b6d1b 100644 --- a/plat/arm/board/sgi575/fdts/sgi575_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, ARM Limited and Contributors. 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/board/sgi575/fdts/sgi575_nt_fw_config.dts b/plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_nt_fw_config.dts similarity index 86% rename from plat/arm/board/sgi575/fdts/sgi575_nt_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_nt_fw_config.dts index 260247a0d..05734883a 100644 --- a/plat/arm/board/sgi575/fdts/sgi575_nt_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_nt_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, ARM Limited and Contributors. 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/board/sgi575/fdts/sgi575_tb_fw_config.dts b/plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_tb_fw_config.dts similarity index 89% rename from plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts rename to plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_tb_fw_config.dts index 49eda2735..c370623bb 100644 --- a/plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts +++ b/plat/arm/board/neoverse_rd/platform/sgi575/fdts/sgi575_tb_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. 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/board/sgi575/include/platform_def.h b/plat/arm/board/neoverse_rd/platform/sgi575/include/platform_def.h similarity index 100% rename from plat/arm/board/sgi575/include/platform_def.h rename to plat/arm/board/neoverse_rd/platform/sgi575/include/platform_def.h diff --git a/plat/arm/board/sgi575/platform.mk b/plat/arm/board/neoverse_rd/platform/sgi575/platform.mk similarity index 92% rename from plat/arm/board/sgi575/platform.mk rename to plat/arm/board/neoverse_rd/platform/sgi575/platform.mk index 2a03b1d0f..3f4bd38ec 100644 --- a/plat/arm/board/sgi575/platform.mk +++ b/plat/arm/board/neoverse_rd/platform/sgi575/platform.mk @@ -6,15 +6,15 @@ $(warning Platform ${PLAT} is deprecated. Some of the features might not work as expected) -include plat/arm/css/neoverse_rd/nrd-common.mk +include plat/arm/board/neoverse_rd/common/nrd-common.mk -SGI575_BASE = plat/arm/board/sgi575 +SGI575_BASE = plat/arm/board/neoverse_rd/platform/sgi575 PLAT_INCLUDES += -I${SGI575_BASE}/include/ SGI_CPU_SOURCES := lib/cpus/aarch64/cortex_a75.S -PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat.c +PLAT_BL_COMMON_SOURCES += ${NRD_COMMON_BASE}/nrd_plat.c BL1_SOURCES += ${SGI_CPU_SOURCES} \ ${SGI575_BASE}/sgi575_err.c diff --git a/plat/arm/board/sgi575/sgi575_err.c b/plat/arm/board/neoverse_rd/platform/sgi575/sgi575_err.c similarity index 71% rename from plat/arm/board/sgi575/sgi575_err.c rename to plat/arm/board/neoverse_rd/platform/sgi575/sgi575_err.c index 21bfcb73a..7e656abb4 100644 --- a/plat/arm/board/sgi575/sgi575_err.c +++ b/plat/arm/board/neoverse_rd/platform/sgi575/sgi575_err.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, 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/board/sgi575/sgi575_plat.c b/plat/arm/board/neoverse_rd/platform/sgi575/sgi575_plat.c similarity index 100% rename from plat/arm/board/sgi575/sgi575_plat.c rename to plat/arm/board/neoverse_rd/platform/sgi575/sgi575_plat.c diff --git a/plat/arm/board/sgi575/sgi575_security.c b/plat/arm/board/neoverse_rd/platform/sgi575/sgi575_security.c similarity index 100% rename from plat/arm/board/sgi575/sgi575_security.c rename to plat/arm/board/neoverse_rd/platform/sgi575/sgi575_security.c diff --git a/plat/arm/board/sgi575/sgi575_topology.c b/plat/arm/board/neoverse_rd/platform/sgi575/sgi575_topology.c similarity index 94% rename from plat/arm/board/sgi575/sgi575_topology.c rename to plat/arm/board/neoverse_rd/platform/sgi575/sgi575_topology.c index f7c385673..9f5e18a99 100644 --- a/plat/arm/board/sgi575/sgi575_topology.c +++ b/plat/arm/board/neoverse_rd/platform/sgi575/sgi575_topology.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, ARM Limited and Contributors. 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/board/sgi575/sgi575_trusted_boot.c b/plat/arm/board/neoverse_rd/platform/sgi575/sgi575_trusted_boot.c similarity index 88% rename from plat/arm/board/sgi575/sgi575_trusted_boot.c rename to plat/arm/board/neoverse_rd/platform/sgi575/sgi575_trusted_boot.c index 4592b8fba..84622d004 100644 --- a/plat/arm/board/sgi575/sgi575_trusted_boot.c +++ b/plat/arm/board/neoverse_rd/platform/sgi575/sgi575_trusted_boot.c @@ -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 */