Commit edf771a1 authored by Aditya Angadi's avatar Aditya Angadi
Browse files

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: default avatarAditya Angadi <aditya.angadi@arm.com>
Change-Id: I1702bab39c501f8c0a09df131cb2394d54c83bcf
parent f422a7bf
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
/dts-v1/; /dts-v1/;
/ { / {
/* compatible string */ /* compatible string */
compatible = "arm,rd-daniel"; compatible = "arm,rd-v1";
/* /*
* Place holder for system-id node with default values. The * Place holder for system-id node with default values. The
......
...@@ -3,45 +3,45 @@ ...@@ -3,45 +3,45 @@
# SPDX-License-Identifier: BSD-3-Clause # 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 GIC_ENABLE_V4_EXTN := 1
include plat/arm/css/sgi/sgi-common.mk 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 SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_v1.S
PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat.c PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat.c
BL1_SOURCES += ${SGI_CPU_SOURCES} \ BL1_SOURCES += ${SGI_CPU_SOURCES} \
${RDDANIEL_BASE}/rddaniel_err.c ${RDV1_BASE}/rdv1_err.c
BL2_SOURCES += ${RDDANIEL_BASE}/rddaniel_plat.c \ BL2_SOURCES += ${RDV1_BASE}/rdv1_plat.c \
${RDDANIEL_BASE}/rddaniel_security.c \ ${RDV1_BASE}/rdv1_security.c \
${RDDANIEL_BASE}/rddaniel_err.c \ ${RDV1_BASE}/rdv1_err.c \
lib/utils/mem_region.c \ lib/utils/mem_region.c \
drivers/arm/tzc/tzc400.c \ drivers/arm/tzc/tzc400.c \
plat/arm/common/arm_tzc400.c \ plat/arm/common/arm_tzc400.c \
plat/arm/common/arm_nor_psci_mem_protect.c plat/arm/common/arm_nor_psci_mem_protect.c
BL31_SOURCES += ${SGI_CPU_SOURCES} \ BL31_SOURCES += ${SGI_CPU_SOURCES} \
${RDDANIEL_BASE}/rddaniel_plat.c \ ${RDV1_BASE}/rdv1_plat.c \
${RDDANIEL_BASE}/rddaniel_topology.c \ ${RDV1_BASE}/rdv1_topology.c \
drivers/cfi/v2m/v2m_flash.c \ drivers/cfi/v2m/v2m_flash.c \
lib/utils/mem_region.c \ lib/utils/mem_region.c \
plat/arm/common/arm_nor_psci_mem_protect.c plat/arm/common/arm_nor_psci_mem_protect.c
ifeq (${TRUSTED_BOARD_BOOT}, 1) ifeq (${TRUSTED_BOARD_BOOT}, 1)
BL1_SOURCES += ${RDDANIEL_BASE}/rddaniel_trusted_boot.c BL1_SOURCES += ${RDV1_BASE}/rdv1_trusted_boot.c
BL2_SOURCES += ${RDDANIEL_BASE}/rddaniel_trusted_boot.c BL2_SOURCES += ${RDV1_BASE}/rdv1_trusted_boot.c
endif endif
# Add the FDT_SOURCES and options for Dynamic Config # Add the FDT_SOURCES and options for Dynamic Config
FDT_SOURCES += ${RDDANIEL_BASE}/fdts/${PLAT}_fw_config.dts \ FDT_SOURCES += ${RDV1_BASE}/fdts/${PLAT}_fw_config.dts \
${RDDANIEL_BASE}/fdts/${PLAT}_tb_fw_config.dts ${RDV1_BASE}/fdts/${PLAT}_tb_fw_config.dts
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_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})) ...@@ -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 # 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})) $(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 NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb
# Add the NT_FW_CONFIG to FIP and specify the same to certtool # Add the NT_FW_CONFIG to FIP and specify the same to certtool
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
/* /*
* rddaniel error handler * rdv1 error handler
*/ */
void __dead2 plat_arm_error_handler(int err) void __dead2 plat_arm_error_handler(int err)
{ {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
/****************************************************************************** /******************************************************************************
* The power domain tree descriptor. * 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, PLAT_ARM_CLUSTER_COUNT,
CSS_SGI_MAX_CPUS_PER_CLUSTER, CSS_SGI_MAX_CPUS_PER_CLUSTER,
CSS_SGI_MAX_CPUS_PER_CLUSTER, CSS_SGI_MAX_CPUS_PER_CLUSTER,
...@@ -35,7 +35,7 @@ const unsigned char rd_daniel_pd_tree_desc[] = { ...@@ -35,7 +35,7 @@ const unsigned char rd_daniel_pd_tree_desc[] = {
******************************************************************************/ ******************************************************************************/
const unsigned char *plat_get_power_domain_tree_desc(void) const unsigned char *plat_get_power_domain_tree_desc(void)
{ {
return rd_daniel_pd_tree_desc; return rd_v1_pd_tree_desc;
} }
/******************************************************************************* /*******************************************************************************
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#define RD_N1E1_EDGE_SID_VER_PART_NUM 0x0786 #define RD_N1E1_EDGE_SID_VER_PART_NUM 0x0786
#define RD_E1_EDGE_CONFIG_ID 0x2 #define RD_E1_EDGE_CONFIG_ID 0x2
/* SID Version values for RD-Daniel */ /* SID Version values for RD-V1 */
#define RD_DANIEL_SID_VER_PART_NUM 0x078a #define RD_V1_SID_VER_PART_NUM 0x078a
/* SID Version values for RD-N2 */ /* SID Version values for RD-N2 */
#define RD_N2_SID_VER_PART_NUM 0x07B7 #define RD_N2_SID_VER_PART_NUM 0x07B7
......
...@@ -74,7 +74,7 @@ static scmi_channel_plat_info_t rd_n1e1_edge_scmi_plat_info[] = { ...@@ -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) 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 || 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) { sgi_plat_info.platform_id == RD_N2_SID_VER_PART_NUM) {
if (channel_id >= ARRAY_SIZE(rd_n1e1_edge_scmi_plat_info)) if (channel_id >= ARRAY_SIZE(rd_n1e1_edge_scmi_plat_info))
panic(); panic();
...@@ -108,12 +108,12 @@ void sgi_bl31_common_platform_setup(void) ...@@ -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) 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. * PSCI platform callbacks are supported.
*/ */
if (((sgi_plat_info.platform_id == RD_N1E1_EDGE_SID_VER_PART_NUM) && 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.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->cpu_standby = NULL;
ops->system_off = NULL; ops->system_off = NULL;
ops->system_reset = NULL; ops->system_reset = NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment