diff options
-rw-r--r-- | drivers/renesas/common/console/rcar_console.S (renamed from drivers/renesas/rcar/console/rcar_console.S) | 0 | ||||
-rw-r--r-- | drivers/renesas/common/console/rcar_printf.c (renamed from drivers/renesas/rcar/console/rcar_printf.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/common/console/rcar_printf.h (renamed from drivers/renesas/rcar/console/rcar_printf.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/common/scif/scif.S (renamed from drivers/renesas/rcar/scif/scif.S) | 0 | ||||
-rw-r--r-- | plat/renesas/common/common.mk | 4 | ||||
-rw-r--r-- | plat/renesas/rcar/platform.mk | 6 |
6 files changed, 5 insertions, 5 deletions
diff --git a/drivers/renesas/rcar/console/rcar_console.S b/drivers/renesas/common/console/rcar_console.S index 29baa67a4a..29baa67a4a 100644 --- a/drivers/renesas/rcar/console/rcar_console.S +++ b/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 index ad074fe059..ad074fe059 100644 --- a/drivers/renesas/rcar/console/rcar_printf.c +++ b/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 index 5da70e6365..5da70e6365 100644 --- a/drivers/renesas/rcar/console/rcar_printf.h +++ b/drivers/renesas/common/console/rcar_printf.h diff --git a/drivers/renesas/rcar/scif/scif.S b/drivers/renesas/common/scif/scif.S index beb8dd8383..beb8dd8383 100644 --- a/drivers/renesas/rcar/scif/scif.S +++ b/drivers/renesas/common/scif/scif.S diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index 6e8786d660..cdcbc21443 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 6685a8115e..05f9c2d260 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) |