From 499c2713f05c602e6f22467c18be30cf9697c42d Mon Sep 17 00:00:00 2001 From: Biju Das Date: Wed, 16 Dec 2020 11:28:07 +0000 Subject: [PATCH] plat: renesas: Move to common Move rcar plat code to common directory, so that the same code can be re-used by both R-Car Gen3 and RZ/G2 platforms. Signed-off-by: Biju Das Reviewed-by: Lad Prabhakar Change-Id: I1001bea1a8a9232a03ddbf6931ca3c764ba1e181 --- plat/renesas/{rcar => common}/bl2_cpg_init.c | 0 plat/renesas/{rcar => common}/bl2_interrupt_error.c | 0 .../{rcar => common}/bl2_plat_mem_params_desc.c | 0 plat/renesas/{rcar => common}/bl2_secure_setting.c | 0 plat/renesas/{rcar => common}/bl31_plat_setup.c | 0 plat/renesas/common/common.mk | 9 +++++++++ plat/renesas/{rcar => common}/plat_image_load.c | 0 plat/renesas/{rcar => common}/plat_pm.c | 0 plat/renesas/{rcar => common}/plat_storage.c | 0 plat/renesas/{rcar => common}/plat_topology.c | 0 plat/renesas/rcar/platform.mk | 12 +----------- 11 files changed, 10 insertions(+), 11 deletions(-) rename plat/renesas/{rcar => common}/bl2_cpg_init.c (100%) rename plat/renesas/{rcar => common}/bl2_interrupt_error.c (100%) rename plat/renesas/{rcar => common}/bl2_plat_mem_params_desc.c (100%) rename plat/renesas/{rcar => common}/bl2_secure_setting.c (100%) rename plat/renesas/{rcar => common}/bl31_plat_setup.c (100%) rename plat/renesas/{rcar => common}/plat_image_load.c (100%) rename plat/renesas/{rcar => common}/plat_pm.c (100%) rename plat/renesas/{rcar => common}/plat_storage.c (100%) rename plat/renesas/{rcar => common}/plat_topology.c (100%) diff --git a/plat/renesas/rcar/bl2_cpg_init.c b/plat/renesas/common/bl2_cpg_init.c similarity index 100% rename from plat/renesas/rcar/bl2_cpg_init.c rename to plat/renesas/common/bl2_cpg_init.c diff --git a/plat/renesas/rcar/bl2_interrupt_error.c b/plat/renesas/common/bl2_interrupt_error.c similarity index 100% rename from plat/renesas/rcar/bl2_interrupt_error.c rename to plat/renesas/common/bl2_interrupt_error.c diff --git a/plat/renesas/rcar/bl2_plat_mem_params_desc.c b/plat/renesas/common/bl2_plat_mem_params_desc.c similarity index 100% rename from plat/renesas/rcar/bl2_plat_mem_params_desc.c rename to plat/renesas/common/bl2_plat_mem_params_desc.c diff --git a/plat/renesas/rcar/bl2_secure_setting.c b/plat/renesas/common/bl2_secure_setting.c similarity index 100% rename from plat/renesas/rcar/bl2_secure_setting.c rename to plat/renesas/common/bl2_secure_setting.c diff --git a/plat/renesas/rcar/bl31_plat_setup.c b/plat/renesas/common/bl31_plat_setup.c similarity index 100% rename from plat/renesas/rcar/bl31_plat_setup.c rename to plat/renesas/common/bl31_plat_setup.c diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index cb0bb07b2..cadb3d764 100644 --- a/plat/renesas/common/common.mk +++ b/plat/renesas/common/common.mk @@ -80,6 +80,12 @@ BL2_SOURCES += ${RCAR_GIC_SOURCES} \ common/desc_image_load.c \ plat/renesas/common/aarch64/platform_common.c \ plat/renesas/common/aarch64/plat_helpers.S \ + plat/renesas/common/bl2_interrupt_error.c \ + plat/renesas/common/bl2_secure_setting.c \ + plat/renesas/common/plat_storage.c \ + plat/renesas/common/bl2_plat_mem_params_desc.c \ + plat/renesas/common/plat_image_load.c \ + plat/renesas/common/bl2_cpg_init.c \ drivers/renesas/common/console/rcar_printf.c \ drivers/renesas/common/scif/scif.S \ drivers/renesas/common/common.c \ @@ -105,8 +111,11 @@ BL31_SOURCES += ${RCAR_GIC_SOURCES} \ lib/cpus/aarch64/cortex_a53.S \ lib/cpus/aarch64/cortex_a57.S \ plat/common/plat_psci_common.c \ + plat/renesas/common/plat_topology.c \ plat/renesas/common/aarch64/plat_helpers.S \ plat/renesas/common/aarch64/platform_common.c \ + plat/renesas/common/bl31_plat_setup.c \ + plat/renesas/common/plat_pm.c \ drivers/renesas/common/console/rcar_console.S \ drivers/renesas/common/console/rcar_printf.c \ drivers/renesas/common/delay/micro_delay.c \ diff --git a/plat/renesas/rcar/plat_image_load.c b/plat/renesas/common/plat_image_load.c similarity index 100% rename from plat/renesas/rcar/plat_image_load.c rename to plat/renesas/common/plat_image_load.c diff --git a/plat/renesas/rcar/plat_pm.c b/plat/renesas/common/plat_pm.c similarity index 100% rename from plat/renesas/rcar/plat_pm.c rename to plat/renesas/common/plat_pm.c diff --git a/plat/renesas/rcar/plat_storage.c b/plat/renesas/common/plat_storage.c similarity index 100% rename from plat/renesas/rcar/plat_storage.c rename to plat/renesas/common/plat_storage.c diff --git a/plat/renesas/rcar/plat_topology.c b/plat/renesas/common/plat_topology.c similarity index 100% rename from plat/renesas/rcar/plat_topology.c rename to plat/renesas/common/plat_topology.c diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index ee393f2f4..5e4978c0a 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -312,19 +312,9 @@ PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/common/pwrc \ -Idrivers/renesas/common/io -BL2_SOURCES += plat/renesas/rcar/bl2_interrupt_error.c \ - plat/renesas/rcar/bl2_secure_setting.c \ - plat/renesas/rcar/bl2_plat_setup.c \ - plat/renesas/rcar/plat_storage.c \ - plat/renesas/rcar/bl2_plat_mem_params_desc.c \ - plat/renesas/rcar/plat_image_load.c \ - plat/renesas/rcar/bl2_cpg_init.c \ +BL2_SOURCES += plat/renesas/rcar/bl2_plat_setup.c \ drivers/renesas/rcar/board/board.c -BL31_SOURCES += plat/renesas/rcar/plat_topology.c \ - plat/renesas/rcar/bl31_plat_setup.c \ - plat/renesas/rcar/plat_pm.c - ifeq (${RCAR_GEN3_ULCB},1) BL31_SOURCES += drivers/renesas/rcar/cpld/ulcb_cpld.c endif -- 2.39.5