From edf771a11f7331a3c5e640dcd35fb930f9a08170 Mon Sep 17 00:00:00 2001 From: Aditya Angadi Date: Tue, 15 Dec 2020 17:10:50 +0530 Subject: [PATCH] plat/arm: rename rddaniel to rdv1 Reference Design platform RD-Daniel has been renamed to RD-V1. Correspondingly, remove all uses of 'rddaniel' and replace it with 'rdv1' where appropriate. Signed-off-by: Aditya Angadi Change-Id: I1702bab39c501f8c0a09df131cb2394d54c83bcf --- .../fdts/rdv1_fw_config.dts} | 0 .../fdts/rdv1_nt_fw_config.dts} | 2 +- .../fdts/rdv1_tb_fw_config.dts} | 0 .../{rddaniel => rdv1}/include/platform_def.h | 0 plat/arm/board/{rddaniel => rdv1}/platform.mk | 28 +++++++++---------- .../rddaniel_err.c => rdv1/rdv1_err.c} | 2 +- .../rddaniel_plat.c => rdv1/rdv1_plat.c} | 0 .../rdv1_security.c} | 0 .../rdv1_topology.c} | 4 +-- .../rdv1_trusted_boot.c} | 0 plat/arm/css/sgi/include/sgi_variant.h | 4 +-- plat/arm/css/sgi/sgi_bl31_setup.c | 6 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) rename plat/arm/board/{rddaniel/fdts/rddaniel_fw_config.dts => rdv1/fdts/rdv1_fw_config.dts} (100%) rename plat/arm/board/{rddaniel/fdts/rddaniel_nt_fw_config.dts => rdv1/fdts/rdv1_nt_fw_config.dts} (93%) rename plat/arm/board/{rddaniel/fdts/rddaniel_tb_fw_config.dts => rdv1/fdts/rdv1_tb_fw_config.dts} (100%) rename plat/arm/board/{rddaniel => rdv1}/include/platform_def.h (100%) rename plat/arm/board/{rddaniel => rdv1}/platform.mk (66%) rename plat/arm/board/{rddaniel/rddaniel_err.c => rdv1/rdv1_err.c} (90%) rename plat/arm/board/{rddaniel/rddaniel_plat.c => rdv1/rdv1_plat.c} (100%) rename plat/arm/board/{rddaniel/rddaniel_security.c => rdv1/rdv1_security.c} (100%) rename plat/arm/board/{rddaniel/rddaniel_topology.c => rdv1/rdv1_topology.c} (96%) rename plat/arm/board/{rddaniel/rddaniel_trusted_boot.c => rdv1/rdv1_trusted_boot.c} (100%) diff --git a/plat/arm/board/rddaniel/fdts/rddaniel_fw_config.dts b/plat/arm/board/rdv1/fdts/rdv1_fw_config.dts similarity index 100% rename from plat/arm/board/rddaniel/fdts/rddaniel_fw_config.dts rename to plat/arm/board/rdv1/fdts/rdv1_fw_config.dts diff --git a/plat/arm/board/rddaniel/fdts/rddaniel_nt_fw_config.dts b/plat/arm/board/rdv1/fdts/rdv1_nt_fw_config.dts similarity index 93% rename from plat/arm/board/rddaniel/fdts/rddaniel_nt_fw_config.dts rename to plat/arm/board/rdv1/fdts/rdv1_nt_fw_config.dts index 4d4580d68..62ba2c3f2 100644 --- a/plat/arm/board/rddaniel/fdts/rddaniel_nt_fw_config.dts +++ b/plat/arm/board/rdv1/fdts/rdv1_nt_fw_config.dts @@ -7,7 +7,7 @@ /dts-v1/; / { /* compatible string */ - compatible = "arm,rd-daniel"; + compatible = "arm,rd-v1"; /* * Place holder for system-id node with default values. The diff --git a/plat/arm/board/rddaniel/fdts/rddaniel_tb_fw_config.dts b/plat/arm/board/rdv1/fdts/rdv1_tb_fw_config.dts similarity index 100% rename from plat/arm/board/rddaniel/fdts/rddaniel_tb_fw_config.dts rename to plat/arm/board/rdv1/fdts/rdv1_tb_fw_config.dts diff --git a/plat/arm/board/rddaniel/include/platform_def.h b/plat/arm/board/rdv1/include/platform_def.h similarity index 100% rename from plat/arm/board/rddaniel/include/platform_def.h rename to plat/arm/board/rdv1/include/platform_def.h diff --git a/plat/arm/board/rddaniel/platform.mk b/plat/arm/board/rdv1/platform.mk similarity index 66% rename from plat/arm/board/rddaniel/platform.mk rename to plat/arm/board/rdv1/platform.mk index 6553ae27e..5033b1874 100644 --- a/plat/arm/board/rddaniel/platform.mk +++ b/plat/arm/board/rdv1/platform.mk @@ -3,45 +3,45 @@ # SPDX-License-Identifier: BSD-3-Clause # -# RD-Daniel platform uses GIC-Clayton which is based on GICv4.1 +# RD-V1 platform uses GIC-Clayton which is based on GICv4.1 GIC_ENABLE_V4_EXTN := 1 include plat/arm/css/sgi/sgi-common.mk -RDDANIEL_BASE = plat/arm/board/rddaniel +RDV1_BASE = plat/arm/board/rdv1 -PLAT_INCLUDES += -I${RDDANIEL_BASE}/include/ +PLAT_INCLUDES += -I${RDV1_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} \ - ${RDDANIEL_BASE}/rddaniel_err.c + ${RDV1_BASE}/rdv1_err.c -BL2_SOURCES += ${RDDANIEL_BASE}/rddaniel_plat.c \ - ${RDDANIEL_BASE}/rddaniel_security.c \ - ${RDDANIEL_BASE}/rddaniel_err.c \ +BL2_SOURCES += ${RDV1_BASE}/rdv1_plat.c \ + ${RDV1_BASE}/rdv1_security.c \ + ${RDV1_BASE}/rdv1_err.c \ lib/utils/mem_region.c \ drivers/arm/tzc/tzc400.c \ plat/arm/common/arm_tzc400.c \ plat/arm/common/arm_nor_psci_mem_protect.c BL31_SOURCES += ${SGI_CPU_SOURCES} \ - ${RDDANIEL_BASE}/rddaniel_plat.c \ - ${RDDANIEL_BASE}/rddaniel_topology.c \ + ${RDV1_BASE}/rdv1_plat.c \ + ${RDV1_BASE}/rdv1_topology.c \ drivers/cfi/v2m/v2m_flash.c \ lib/utils/mem_region.c \ plat/arm/common/arm_nor_psci_mem_protect.c ifeq (${TRUSTED_BOARD_BOOT}, 1) -BL1_SOURCES += ${RDDANIEL_BASE}/rddaniel_trusted_boot.c -BL2_SOURCES += ${RDDANIEL_BASE}/rddaniel_trusted_boot.c +BL1_SOURCES += ${RDV1_BASE}/rdv1_trusted_boot.c +BL2_SOURCES += ${RDV1_BASE}/rdv1_trusted_boot.c endif # Add the FDT_SOURCES and options for Dynamic Config -FDT_SOURCES += ${RDDANIEL_BASE}/fdts/${PLAT}_fw_config.dts \ - ${RDDANIEL_BASE}/fdts/${PLAT}_tb_fw_config.dts +FDT_SOURCES += ${RDV1_BASE}/fdts/${PLAT}_fw_config.dts \ + ${RDV1_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 @@ -50,7 +50,7 @@ $(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config,${FW_CONFIG})) # Add the TB_FW_CONFIG to FIP and specify the same to certtool $(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config,${TB_FW_CONFIG})) -FDT_SOURCES += ${RDDANIEL_BASE}/fdts/${PLAT}_nt_fw_config.dts +FDT_SOURCES += ${RDV1_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/rddaniel/rddaniel_err.c b/plat/arm/board/rdv1/rdv1_err.c similarity index 90% rename from plat/arm/board/rddaniel/rddaniel_err.c rename to plat/arm/board/rdv1/rdv1_err.c index 5e1094219..68f9a3ef6 100644 --- a/plat/arm/board/rddaniel/rddaniel_err.c +++ b/plat/arm/board/rdv1/rdv1_err.c @@ -7,7 +7,7 @@ #include /* - * rddaniel error handler + * rdv1 error handler */ void __dead2 plat_arm_error_handler(int err) { diff --git a/plat/arm/board/rddaniel/rddaniel_plat.c b/plat/arm/board/rdv1/rdv1_plat.c similarity index 100% rename from plat/arm/board/rddaniel/rddaniel_plat.c rename to plat/arm/board/rdv1/rdv1_plat.c diff --git a/plat/arm/board/rddaniel/rddaniel_security.c b/plat/arm/board/rdv1/rdv1_security.c similarity index 100% rename from plat/arm/board/rddaniel/rddaniel_security.c rename to plat/arm/board/rdv1/rdv1_security.c diff --git a/plat/arm/board/rddaniel/rddaniel_topology.c b/plat/arm/board/rdv1/rdv1_topology.c similarity index 96% rename from plat/arm/board/rddaniel/rddaniel_topology.c rename to plat/arm/board/rdv1/rdv1_topology.c index 55f5e04da..ab64fd8d0 100644 --- a/plat/arm/board/rddaniel/rddaniel_topology.c +++ b/plat/arm/board/rdv1/rdv1_topology.c @@ -10,7 +10,7 @@ /****************************************************************************** * The power domain tree descriptor. ******************************************************************************/ -const unsigned char rd_daniel_pd_tree_desc[] = { +const unsigned char rd_v1_pd_tree_desc[] = { PLAT_ARM_CLUSTER_COUNT, CSS_SGI_MAX_CPUS_PER_CLUSTER, CSS_SGI_MAX_CPUS_PER_CLUSTER, @@ -35,7 +35,7 @@ const unsigned char rd_daniel_pd_tree_desc[] = { ******************************************************************************/ const unsigned char *plat_get_power_domain_tree_desc(void) { - return rd_daniel_pd_tree_desc; + return rd_v1_pd_tree_desc; } /******************************************************************************* diff --git a/plat/arm/board/rddaniel/rddaniel_trusted_boot.c b/plat/arm/board/rdv1/rdv1_trusted_boot.c similarity index 100% rename from plat/arm/board/rddaniel/rddaniel_trusted_boot.c rename to plat/arm/board/rdv1/rdv1_trusted_boot.c diff --git a/plat/arm/css/sgi/include/sgi_variant.h b/plat/arm/css/sgi/include/sgi_variant.h index eb12f3f35..ecf6d93d6 100644 --- a/plat/arm/css/sgi/include/sgi_variant.h +++ b/plat/arm/css/sgi/include/sgi_variant.h @@ -14,8 +14,8 @@ #define RD_N1E1_EDGE_SID_VER_PART_NUM 0x0786 #define RD_E1_EDGE_CONFIG_ID 0x2 -/* SID Version values for RD-Daniel */ -#define RD_DANIEL_SID_VER_PART_NUM 0x078a +/* SID Version values for RD-V1 */ +#define RD_V1_SID_VER_PART_NUM 0x078a /* SID Version values for RD-N2 */ #define RD_N2_SID_VER_PART_NUM 0x07B7 diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c index d5c7593f6..89e2cab08 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/sgi/sgi_bl31_setup.c @@ -74,7 +74,7 @@ static scmi_channel_plat_info_t rd_n1e1_edge_scmi_plat_info[] = { scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id) { if (sgi_plat_info.platform_id == RD_N1E1_EDGE_SID_VER_PART_NUM || - sgi_plat_info.platform_id == RD_DANIEL_SID_VER_PART_NUM || + sgi_plat_info.platform_id == RD_V1_SID_VER_PART_NUM || sgi_plat_info.platform_id == RD_N2_SID_VER_PART_NUM) { if (channel_id >= ARRAY_SIZE(rd_n1e1_edge_scmi_plat_info)) panic(); @@ -108,12 +108,12 @@ void sgi_bl31_common_platform_setup(void) const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops) { /* - * For RD-E1-Edge and RD-Daniel platforms, only CPU power ON/OFF + * For RD-E1-Edge and RD-V1 platforms, only CPU power ON/OFF * PSCI platform callbacks are supported. */ if (((sgi_plat_info.platform_id == RD_N1E1_EDGE_SID_VER_PART_NUM) && (sgi_plat_info.config_id == RD_E1_EDGE_CONFIG_ID)) || - (sgi_plat_info.platform_id == RD_DANIEL_SID_VER_PART_NUM)) { + (sgi_plat_info.platform_id == RD_V1_SID_VER_PART_NUM)) { ops->cpu_standby = NULL; ops->system_off = NULL; ops->system_reset = NULL;