From 865e34741b02b3a9ddf9f652f2649407f33debb0 Mon Sep 17 00:00:00 2001 From: Biju Das Date: Wed, 16 Dec 2020 10:36:17 +0000 Subject: [PATCH] drivers: renesas: console: Move to common Move console/scif driver 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: I0b15e4f4ffaaa99e77bcee32b1dad648eeadcd9b --- drivers/renesas/{rcar => common}/console/rcar_console.S | 0 drivers/renesas/{rcar => common}/console/rcar_printf.c | 0 drivers/renesas/{rcar => common}/console/rcar_printf.h | 0 drivers/renesas/{rcar => common}/scif/scif.S | 0 plat/renesas/common/common.mk | 4 ++++ plat/renesas/rcar/platform.mk | 6 +----- 6 files changed, 5 insertions(+), 5 deletions(-) rename drivers/renesas/{rcar => common}/console/rcar_console.S (100%) rename drivers/renesas/{rcar => common}/console/rcar_printf.c (100%) rename drivers/renesas/{rcar => common}/console/rcar_printf.h (100%) rename drivers/renesas/{rcar => common}/scif/scif.S (100%) diff --git a/drivers/renesas/rcar/console/rcar_console.S b/drivers/renesas/common/console/rcar_console.S similarity index 100% rename from drivers/renesas/rcar/console/rcar_console.S rename to drivers/renesas/common/console/rcar_console.S diff --git a/drivers/renesas/rcar/console/rcar_printf.c b/drivers/renesas/common/console/rcar_printf.c similarity index 100% rename from drivers/renesas/rcar/console/rcar_printf.c rename to drivers/renesas/common/console/rcar_printf.c diff --git a/drivers/renesas/rcar/console/rcar_printf.h b/drivers/renesas/common/console/rcar_printf.h similarity index 100% rename from drivers/renesas/rcar/console/rcar_printf.h rename to drivers/renesas/common/console/rcar_printf.h diff --git a/drivers/renesas/rcar/scif/scif.S b/drivers/renesas/common/scif/scif.S similarity index 100% rename from drivers/renesas/rcar/scif/scif.S rename to drivers/renesas/common/scif/scif.S diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index 6e8786d66..cdcbc2144 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 \ + drivers/renesas/common/console/rcar_printf.c \ + drivers/renesas/common/scif/scif.S \ drivers/renesas/common/common.c \ drivers/renesas/common/io/io_emmcdrv.c \ drivers/renesas/common/io/io_memdrv.c \ @@ -94,6 +96,8 @@ BL31_SOURCES += ${RCAR_GIC_SOURCES} \ lib/cpus/aarch64/cortex_a53.S \ lib/cpus/aarch64/cortex_a57.S \ plat/common/plat_psci_common.c \ + drivers/renesas/common/console/rcar_console.S \ + drivers/renesas/common/console/rcar_printf.c \ drivers/renesas/common/pwrc/call_sram.S \ drivers/renesas/common/pwrc/pwrc.c \ drivers/renesas/common/common.c \ diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index 6685a8115..05f9c2d26 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -306,7 +306,7 @@ PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/rcar/avs \ -Idrivers/renesas/rcar/delay \ -Idrivers/renesas/rcar/rom \ - -Idrivers/renesas/rcar/scif \ + -Idrivers/renesas/common/scif \ -Idrivers/renesas/common/emmc \ -Idrivers/renesas/common/pwrc \ -Idrivers/renesas/common/io @@ -320,8 +320,6 @@ BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \ plat/renesas/rcar/bl2_plat_mem_params_desc.c \ plat/renesas/rcar/plat_image_load.c \ plat/renesas/rcar/bl2_cpg_init.c \ - drivers/renesas/rcar/console/rcar_printf.c \ - drivers/renesas/rcar/scif/scif.S \ drivers/renesas/rcar/auth/auth_mod.c \ drivers/renesas/rcar/rpc/rpc_driver.c \ drivers/renesas/rcar/dma/dma_driver.c \ @@ -336,8 +334,6 @@ BL31_SOURCES += plat/renesas/rcar/plat_topology.c \ plat/renesas/rcar/aarch64/platform_common.c \ plat/renesas/rcar/bl31_plat_setup.c \ plat/renesas/rcar/plat_pm.c \ - drivers/renesas/rcar/console/rcar_console.S \ - drivers/renesas/rcar/console/rcar_printf.c \ drivers/renesas/rcar/delay/micro_delay.c ifeq (${RCAR_GEN3_ULCB},1) -- 2.39.5