From cdcf1f1492dd05b8f9038e1bbdd091e93c153a3c Mon Sep 17 00:00:00 2001 From: Biju Das Date: Wed, 16 Dec 2020 10:46:36 +0000 Subject: [PATCH] drivers: renesas: delay: Move to common Move delay 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: I5e806bd0e0a0a4b436048513b7089db90ff9805f --- drivers/renesas/{rcar => common}/delay/micro_delay.c | 0 drivers/renesas/{rcar => common}/delay/micro_delay.h | 0 plat/renesas/common/common.mk | 2 ++ plat/renesas/rcar/platform.mk | 6 ++---- 4 files changed, 4 insertions(+), 4 deletions(-) rename drivers/renesas/{rcar => common}/delay/micro_delay.c (100%) rename drivers/renesas/{rcar => common}/delay/micro_delay.h (100%) diff --git a/drivers/renesas/rcar/delay/micro_delay.c b/drivers/renesas/common/delay/micro_delay.c similarity index 100% rename from drivers/renesas/rcar/delay/micro_delay.c rename to drivers/renesas/common/delay/micro_delay.c diff --git a/drivers/renesas/rcar/delay/micro_delay.h b/drivers/renesas/common/delay/micro_delay.h similarity index 100% rename from drivers/renesas/rcar/delay/micro_delay.h rename to drivers/renesas/common/delay/micro_delay.h diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index cdcbc2144..dda7c89f2 100644 --- a/plat/renesas/common/common.mk +++ b/plat/renesas/common/common.mk @@ -84,6 +84,7 @@ BL2_SOURCES += ${RCAR_GIC_SOURCES} \ drivers/renesas/common/io/io_emmcdrv.c \ drivers/renesas/common/io/io_memdrv.c \ drivers/renesas/common/io/io_rcar.c \ + drivers/renesas/common/delay/micro_delay.c \ drivers/renesas/common/emmc/emmc_interrupt.c \ drivers/renesas/common/emmc/emmc_utility.c \ drivers/renesas/common/emmc/emmc_mount.c \ @@ -98,6 +99,7 @@ BL31_SOURCES += ${RCAR_GIC_SOURCES} \ plat/common/plat_psci_common.c \ drivers/renesas/common/console/rcar_console.S \ drivers/renesas/common/console/rcar_printf.c \ + drivers/renesas/common/delay/micro_delay.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 05f9c2d26..ca6fe6b73 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -304,7 +304,7 @@ PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/rcar/cpld/ \ -Idrivers/renesas/common/iic_dvfs \ -Idrivers/renesas/rcar/avs \ - -Idrivers/renesas/rcar/delay \ + -Idrivers/renesas/common/delay \ -Idrivers/renesas/rcar/rom \ -Idrivers/renesas/common/scif \ -Idrivers/renesas/common/emmc \ @@ -324,7 +324,6 @@ BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \ drivers/renesas/rcar/rpc/rpc_driver.c \ drivers/renesas/rcar/dma/dma_driver.c \ drivers/renesas/rcar/avs/avs_driver.c \ - drivers/renesas/rcar/delay/micro_delay.c \ drivers/renesas/rcar/watchdog/swdt.c \ drivers/renesas/rcar/rom/rom_api.c \ drivers/renesas/rcar/board/board.c @@ -333,8 +332,7 @@ 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 \ - drivers/renesas/rcar/delay/micro_delay.c + plat/renesas/rcar/plat_pm.c ifeq (${RCAR_GEN3_ULCB},1) BL31_SOURCES += drivers/renesas/rcar/cpld/ulcb_cpld.c