From fd9b3c5ae9b211670ba9cdbe6520892b6e39df59 Mon Sep 17 00:00:00 2001 From: Biju Das Date: Wed, 16 Dec 2020 11:21:33 +0000 Subject: [PATCH] plat: renesas: aarch64: Move to common Move plat aarch64 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: I66265e5e68bfcf5c3534965fb3549a145c782b47 --- plat/renesas/{rcar => common}/aarch64/plat_helpers.S | 0 plat/renesas/{rcar => common}/aarch64/platform_common.c | 0 plat/renesas/common/common.mk | 4 ++++ plat/renesas/rcar/platform.mk | 6 +----- 4 files changed, 5 insertions(+), 5 deletions(-) rename plat/renesas/{rcar => common}/aarch64/plat_helpers.S (100%) rename plat/renesas/{rcar => common}/aarch64/platform_common.c (100%) diff --git a/plat/renesas/rcar/aarch64/plat_helpers.S b/plat/renesas/common/aarch64/plat_helpers.S similarity index 100% rename from plat/renesas/rcar/aarch64/plat_helpers.S rename to plat/renesas/common/aarch64/plat_helpers.S diff --git a/plat/renesas/rcar/aarch64/platform_common.c b/plat/renesas/common/aarch64/platform_common.c similarity index 100% rename from plat/renesas/rcar/aarch64/platform_common.c rename to plat/renesas/common/aarch64/platform_common.c diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index b342bdc08..cb0bb07b2 100644 --- a/plat/renesas/common/common.mk +++ b/plat/renesas/common/common.mk @@ -78,6 +78,8 @@ BL2_SOURCES += ${RCAR_GIC_SOURCES} \ lib/cpus/aarch64/cortex_a57.S \ ${LIBFDT_SRCS} \ common/desc_image_load.c \ + plat/renesas/common/aarch64/platform_common.c \ + plat/renesas/common/aarch64/plat_helpers.S \ drivers/renesas/common/console/rcar_printf.c \ drivers/renesas/common/scif/scif.S \ drivers/renesas/common/common.c \ @@ -103,6 +105,8 @@ 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/aarch64/plat_helpers.S \ + plat/renesas/common/aarch64/platform_common.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/platform.mk b/plat/renesas/rcar/platform.mk index a861c7c7c..ee393f2f4 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -312,9 +312,7 @@ PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/common/pwrc \ -Idrivers/renesas/common/io -BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \ - plat/renesas/rcar/aarch64/plat_helpers.S \ - plat/renesas/rcar/bl2_interrupt_error.c \ +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 \ @@ -324,8 +322,6 @@ BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \ drivers/renesas/rcar/board/board.c BL31_SOURCES += plat/renesas/rcar/plat_topology.c \ - plat/renesas/rcar/aarch64/plat_helpers.S \ - plat/renesas/rcar/aarch64/platform_common.c \ plat/renesas/rcar/bl31_plat_setup.c \ plat/renesas/rcar/plat_pm.c