From 90aecf1e0adec8bb88bf6737408af8a30e21c741 Mon Sep 17 00:00:00 2001 From: Aditya Angadi Date: Tue, 15 Dec 2020 17:28:08 +0530 Subject: [PATCH] plat/arm: rename rddanielxlr to rdv1mc Reference Design platform RD-Daniel-ConfigXLR has been renamed to RD-V1-MC. Correspondingly, remove all uses of 'rddanielxlr' and replace it with 'rdv1mc' where appropriate. Signed-off-by: Aditya Angadi Change-Id: I5d91c69738397b19ced43949b4080c74678e604c --- .../fdts/rdv1mc_fw_config.dts} | 0 .../fdts/rdv1mc_nt_fw_config.dts} | 2 +- .../fdts/rdv1mc_tb_fw_config.dts} | 0 .../include/platform_def.h | 0 .../board/{rddanielxlr => rdv1mc}/platform.mk | 28 +++++++++---------- .../rddanielxlr_err.c => rdv1mc/rdv1mc_err.c} | 2 +- .../rdv1mc_plat.c} | 22 +++++++-------- .../rdv1mc_security.c} | 0 .../rdv1mc_topology.c} | 4 +-- .../rdv1mc_trusted_boot.c} | 0 10 files changed, 29 insertions(+), 29 deletions(-) rename plat/arm/board/{rddanielxlr/fdts/rddanielxlr_fw_config.dts => rdv1mc/fdts/rdv1mc_fw_config.dts} (100%) rename plat/arm/board/{rddanielxlr/fdts/rddanielxlr_nt_fw_config.dts => rdv1mc/fdts/rdv1mc_nt_fw_config.dts} (92%) rename plat/arm/board/{rddanielxlr/fdts/rddanielxlr_tb_fw_config.dts => rdv1mc/fdts/rdv1mc_tb_fw_config.dts} (100%) rename plat/arm/board/{rddanielxlr => rdv1mc}/include/platform_def.h (100%) rename plat/arm/board/{rddanielxlr => rdv1mc}/platform.mk (68%) rename plat/arm/board/{rddanielxlr/rddanielxlr_err.c => rdv1mc/rdv1mc_err.c} (89%) rename plat/arm/board/{rddanielxlr/rddanielxlr_plat.c => rdv1mc/rdv1mc_plat.c} (83%) rename plat/arm/board/{rddanielxlr/rddanielxlr_security.c => rdv1mc/rdv1mc_security.c} (100%) rename plat/arm/board/{rddanielxlr/rddanielxlr_topology.c => rdv1mc/rdv1mc_topology.c} (96%) rename plat/arm/board/{rddanielxlr/rddanielxlr_trusted_boot.c => rdv1mc/rdv1mc_trusted_boot.c} (100%) diff --git a/plat/arm/board/rddanielxlr/fdts/rddanielxlr_fw_config.dts b/plat/arm/board/rdv1mc/fdts/rdv1mc_fw_config.dts similarity index 100% rename from plat/arm/board/rddanielxlr/fdts/rddanielxlr_fw_config.dts rename to plat/arm/board/rdv1mc/fdts/rdv1mc_fw_config.dts diff --git a/plat/arm/board/rddanielxlr/fdts/rddanielxlr_nt_fw_config.dts b/plat/arm/board/rdv1mc/fdts/rdv1mc_nt_fw_config.dts similarity index 92% rename from plat/arm/board/rddanielxlr/fdts/rddanielxlr_nt_fw_config.dts rename to plat/arm/board/rdv1mc/fdts/rdv1mc_nt_fw_config.dts index 42d07a450..71c7db3cb 100644 --- a/plat/arm/board/rddanielxlr/fdts/rddanielxlr_nt_fw_config.dts +++ b/plat/arm/board/rdv1mc/fdts/rdv1mc_nt_fw_config.dts @@ -7,7 +7,7 @@ /dts-v1/; / { /* compatible string */ - compatible = "arm,rd-daniel-xlr"; + compatible = "arm,rd-v1-mc"; /* * Place holder for system-id node with default values. The diff --git a/plat/arm/board/rddanielxlr/fdts/rddanielxlr_tb_fw_config.dts b/plat/arm/board/rdv1mc/fdts/rdv1mc_tb_fw_config.dts similarity index 100% rename from plat/arm/board/rddanielxlr/fdts/rddanielxlr_tb_fw_config.dts rename to plat/arm/board/rdv1mc/fdts/rdv1mc_tb_fw_config.dts diff --git a/plat/arm/board/rddanielxlr/include/platform_def.h b/plat/arm/board/rdv1mc/include/platform_def.h similarity index 100% rename from plat/arm/board/rddanielxlr/include/platform_def.h rename to plat/arm/board/rdv1mc/include/platform_def.h diff --git a/plat/arm/board/rddanielxlr/platform.mk b/plat/arm/board/rdv1mc/platform.mk similarity index 68% rename from plat/arm/board/rddanielxlr/platform.mk rename to plat/arm/board/rdv1mc/platform.mk index 2f41e2e72..50728416a 100644 --- a/plat/arm/board/rddanielxlr/platform.mk +++ b/plat/arm/board/rdv1mc/platform.mk @@ -9,42 +9,42 @@ GICV3_IMPL_GIC600_MULTICHIP := 1 include plat/arm/css/sgi/sgi-common.mk -RDDANIELXLR_BASE = plat/arm/board/rddanielxlr +RDV1MC_BASE = plat/arm/board/rdv1mc -PLAT_INCLUDES += -I${RDDANIELXLR_BASE}/include/ +PLAT_INCLUDES += -I${RDV1MC_BASE}/include/ SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_v1.S PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat.c BL1_SOURCES += ${SGI_CPU_SOURCES} \ - ${RDDANIELXLR_BASE}/rddanielxlr_err.c + ${RDV1MC_BASE}/rdv1mc_err.c -BL2_SOURCES += ${RDDANIELXLR_BASE}/rddanielxlr_plat.c \ - ${RDDANIELXLR_BASE}/rddanielxlr_security.c \ - ${RDDANIELXLR_BASE}/rddanielxlr_err.c \ +BL2_SOURCES += ${RDV1MC_BASE}/rdv1mc_plat.c \ + ${RDV1MC_BASE}/rdv1mc_security.c \ + ${RDV1MC_BASE}/rdv1mc_err.c \ lib/utils/mem_region.c \ plat/arm/common/arm_nor_psci_mem_protect.c BL31_SOURCES += ${SGI_CPU_SOURCES} \ - ${RDDANIELXLR_BASE}/rddanielxlr_plat.c \ - ${RDDANIELXLR_BASE}/rddanielxlr_topology.c \ + ${RDV1MC_BASE}/rdv1mc_plat.c \ + ${RDV1MC_BASE}/rdv1mc_topology.c \ drivers/cfi/v2m/v2m_flash.c \ drivers/arm/gic/v3/gic600_multichip.c \ lib/utils/mem_region.c \ plat/arm/common/arm_nor_psci_mem_protect.c ifeq (${TRUSTED_BOARD_BOOT}, 1) -BL1_SOURCES += ${RDDANIELXLR_BASE}/rddanielxlr_trusted_boot.c -BL2_SOURCES += ${RDDANIELXLR_BASE}/rddanielxlr_trusted_boot.c +BL1_SOURCES += ${RDV1MC_BASE}/rdv1mc_trusted_boot.c +BL2_SOURCES += ${RDV1MC_BASE}/rdv1mc_trusted_boot.c endif # Enable dynamic addition of MMAP regions in BL31 BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC # Add the FDT_SOURCES and options for Dynamic Config -FDT_SOURCES += ${RDDANIELXLR_BASE}/fdts/${PLAT}_fw_config.dts \ - ${RDDANIELXLR_BASE}/fdts/${PLAT}_tb_fw_config.dts +FDT_SOURCES += ${RDV1MC_BASE}/fdts/${PLAT}_fw_config.dts \ + ${RDV1MC_BASE}/fdts/${PLAT}_tb_fw_config.dts FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb @@ -55,11 +55,11 @@ $(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config,${TB_FW_CONFIG})) $(eval $(call CREATE_SEQ,SEQ,4)) ifneq ($(CSS_SGI_CHIP_COUNT),$(filter $(CSS_SGI_CHIP_COUNT),$(SEQ))) - $(error "Chip count for RD-Daniel Config-XLR should be either $(SEQ) \ + $(error "Chip count for RD-V1-MC should be either $(SEQ) \ currently it is set to ${CSS_SGI_CHIP_COUNT}.") endif -FDT_SOURCES += ${RDDANIELXLR_BASE}/fdts/${PLAT}_nt_fw_config.dts +FDT_SOURCES += ${RDV1MC_BASE}/fdts/${PLAT}_nt_fw_config.dts NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb # Add the NT_FW_CONFIG to FIP and specify the same to certtool diff --git a/plat/arm/board/rddanielxlr/rddanielxlr_err.c b/plat/arm/board/rdv1mc/rdv1mc_err.c similarity index 89% rename from plat/arm/board/rddanielxlr/rddanielxlr_err.c rename to plat/arm/board/rdv1mc/rdv1mc_err.c index bff57cdae..755a5034e 100644 --- a/plat/arm/board/rddanielxlr/rddanielxlr_err.c +++ b/plat/arm/board/rdv1mc/rdv1mc_err.c @@ -7,7 +7,7 @@ #include /* - * rddanielxlr error handler + * rdv1mc error handler */ void __dead2 plat_arm_error_handler(int err) { diff --git a/plat/arm/board/rddanielxlr/rddanielxlr_plat.c b/plat/arm/board/rdv1mc/rdv1mc_plat.c similarity index 83% rename from plat/arm/board/rddanielxlr/rddanielxlr_plat.c rename to plat/arm/board/rdv1mc/rdv1mc_plat.c index a1a4876c0..d85940066 100644 --- a/plat/arm/board/rddanielxlr/rddanielxlr_plat.c +++ b/plat/arm/board/rdv1mc/rdv1mc_plat.c @@ -12,7 +12,7 @@ #include #if defined(IMAGE_BL31) -static const mmap_region_t rddanielxlr_dynamic_mmap[] = { +static const mmap_region_t rdv1mc_dynamic_mmap[] = { ARM_MAP_SHARED_RAM_REMOTE_CHIP(1), CSS_SGI_MAP_DEVICE_REMOTE_CHIP(1), SOC_CSS_MAP_DEVICE_REMOTE_CHIP(1), @@ -28,7 +28,7 @@ static const mmap_region_t rddanielxlr_dynamic_mmap[] = { #endif }; -static struct gic600_multichip_data rddanielxlr_multichip_data __init = { +static struct gic600_multichip_data rdv1mc_multichip_data __init = { .rt_owner_base = PLAT_ARM_GICD_BASE, .rt_owner = 0, .chip_count = CSS_SGI_CHIP_COUNT, @@ -54,7 +54,7 @@ static struct gic600_multichip_data rddanielxlr_multichip_data __init = { } }; -static uintptr_t rddanielxlr_multichip_gicr_frames[] = { +static uintptr_t rdv1mc_multichip_gicr_frames[] = { /* Chip 0's GICR Base */ PLAT_ARM_GICR_BASE, /* Chip 1's GICR BASE */ @@ -106,14 +106,14 @@ void bl31_platform_setup(void) panic(); } else if ((plat_arm_sgi_get_multi_chip_mode() == 1) && (CSS_SGI_CHIP_COUNT > 1)) { - INFO("Enabling support for multi-chip in RD-Daniel Cfg-XLR\n"); + INFO("Enabling support for multi-chip in RD-V1-MC\n"); - for (i = 0; i < ARRAY_SIZE(rddanielxlr_dynamic_mmap); i++) { + for (i = 0; i < ARRAY_SIZE(rdv1mc_dynamic_mmap); i++) { ret = mmap_add_dynamic_region( - rddanielxlr_dynamic_mmap[i].base_pa, - rddanielxlr_dynamic_mmap[i].base_va, - rddanielxlr_dynamic_mmap[i].size, - rddanielxlr_dynamic_mmap[i].attr); + rdv1mc_dynamic_mmap[i].base_pa, + rdv1mc_dynamic_mmap[i].base_va, + rdv1mc_dynamic_mmap[i].size, + rdv1mc_dynamic_mmap[i].attr); if (ret != 0) { ERROR("Failed to add dynamic mmap entry " "(ret=%d)\n", ret); @@ -122,8 +122,8 @@ void bl31_platform_setup(void) } plat_arm_override_gicr_frames( - rddanielxlr_multichip_gicr_frames); - gic600_multichip_init(&rddanielxlr_multichip_data); + rdv1mc_multichip_gicr_frames); + gic600_multichip_init(&rdv1mc_multichip_data); } sgi_bl31_common_platform_setup(); diff --git a/plat/arm/board/rddanielxlr/rddanielxlr_security.c b/plat/arm/board/rdv1mc/rdv1mc_security.c similarity index 100% rename from plat/arm/board/rddanielxlr/rddanielxlr_security.c rename to plat/arm/board/rdv1mc/rdv1mc_security.c diff --git a/plat/arm/board/rddanielxlr/rddanielxlr_topology.c b/plat/arm/board/rdv1mc/rdv1mc_topology.c similarity index 96% rename from plat/arm/board/rddanielxlr/rddanielxlr_topology.c rename to plat/arm/board/rdv1mc/rdv1mc_topology.c index 610e667ce..4486e5cfa 100644 --- a/plat/arm/board/rddanielxlr/rddanielxlr_topology.c +++ b/plat/arm/board/rdv1mc/rdv1mc_topology.c @@ -12,7 +12,7 @@ /****************************************************************************** * The power domain tree descriptor. ******************************************************************************/ -const unsigned char rd_daniel_xlr_pd_tree_desc_multi_chip[] = { +const unsigned char rd_v1_mc_pd_tree_desc_multi_chip[] = { ((PLAT_ARM_CLUSTER_COUNT) * (CSS_SGI_CHIP_COUNT)), CSS_SGI_MAX_CPUS_PER_CLUSTER, CSS_SGI_MAX_CPUS_PER_CLUSTER, @@ -44,7 +44,7 @@ const unsigned char rd_daniel_xlr_pd_tree_desc_multi_chip[] = { const unsigned char *plat_get_power_domain_tree_desc(void) { if (plat_arm_sgi_get_multi_chip_mode() == 1) - return rd_daniel_xlr_pd_tree_desc_multi_chip; + return rd_v1_mc_pd_tree_desc_multi_chip; panic(); } diff --git a/plat/arm/board/rddanielxlr/rddanielxlr_trusted_boot.c b/plat/arm/board/rdv1mc/rdv1mc_trusted_boot.c similarity index 100% rename from plat/arm/board/rddanielxlr/rddanielxlr_trusted_boot.c rename to plat/arm/board/rdv1mc/rdv1mc_trusted_boot.c -- 2.39.5