| commit | 4580328e294b6d01c46df0887f07419abc8c4c1b | [log] [tgz] |
|---|---|---|
| author | Biju Das <biju.das.jz@bp.renesas.com> | Wed Dec 16 11:28:07 2020 +0000 |
| committer | Biju Das <biju.das.jz@bp.renesas.com> | Wed Jan 13 13:03:49 2021 +0000 |
| tree | 49722d435e31c6d7c6980eb1562a4d6d01e2be1e | |
| parent | a19da324283251aa2c5258a3f6fece0ae716a1a1 [diff] |
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 <biju.das.jz@bp.renesas.com> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Change-Id: I1001bea1a8a9232a03ddbf6931ca3c764ba1e181
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 cb0bb07..cadb3d7 100644 --- a/plat/renesas/common/common.mk +++ b/plat/renesas/common/common.mk
@@ -80,6 +80,12 @@ 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 @@ 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 ee393f2..5e4978c 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk
@@ -312,19 +312,9 @@ -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