aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2021-01-14 15:40:54 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-01-14 15:40:54 +0000
commit65d227c3a20c80bb70f796e5839dc96014f0f9cf (patch)
tree434705c9ef0235f2857132877a96982e6669f9ea
parentfc037ffc9e0a86f0ba6fc00cd075fce34dc002ae (diff)
parent27bbfca97587bc2073967dd1eea1076c6da41275 (diff)
downloadtrusted-firmware-a-65d227c3a20c80bb70f796e5839dc96014f0f9cf.tar.gz
Merge changes Ie8922309,I1001bea1,I66265e5e,I2cc0ceda,I04805d72, ... into integration
* changes: plat: renesas: common: Include ulcb_cpld.h conditionally plat: renesas: Move to common plat: renesas: aarch64: Move to common drivers: renesas: Move ddr/qos/qos header files drivers: renesas: rpc: Move to common drivers: renesas: avs: Move to common drivers: renesas: auth: Move to common drivers: renesas: dma: Move to common drivers: renesas: watchdog: Move to common drivers: renesas: rom: Move to common drivers: renesas: delay: Move to common drivers: renesas: console: Move to common drivers: renesas: pwrc: Move to common drivers: renesas: io: Move to common drivers: renesas: eMMC: Move to common
-rw-r--r--drivers/renesas/common/auth/auth_mod.c (renamed from drivers/renesas/rcar/auth/auth_mod.c)0
-rw-r--r--drivers/renesas/common/avs/avs_driver.c (renamed from drivers/renesas/rcar/avs/avs_driver.c)0
-rw-r--r--drivers/renesas/common/avs/avs_driver.h (renamed from drivers/renesas/rcar/avs/avs_driver.h)0
-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/ddr_regs.h (renamed from drivers/renesas/rcar/ddr/ddr_regs.h)0
-rw-r--r--drivers/renesas/common/delay/micro_delay.c (renamed from drivers/renesas/rcar/delay/micro_delay.c)0
-rw-r--r--drivers/renesas/common/delay/micro_delay.h (renamed from drivers/renesas/rcar/delay/micro_delay.h)0
-rw-r--r--drivers/renesas/common/dma/dma_driver.c (renamed from drivers/renesas/rcar/dma/dma_driver.c)0
-rw-r--r--drivers/renesas/common/emmc/emmc_cmd.c (renamed from drivers/renesas/rcar/emmc/emmc_cmd.c)0
-rw-r--r--drivers/renesas/common/emmc/emmc_config.h (renamed from drivers/renesas/rcar/emmc/emmc_config.h)0
-rw-r--r--drivers/renesas/common/emmc/emmc_def.h (renamed from drivers/renesas/rcar/emmc/emmc_def.h)0
-rw-r--r--drivers/renesas/common/emmc/emmc_hal.h (renamed from drivers/renesas/rcar/emmc/emmc_hal.h)0
-rw-r--r--drivers/renesas/common/emmc/emmc_init.c (renamed from drivers/renesas/rcar/emmc/emmc_init.c)0
-rw-r--r--drivers/renesas/common/emmc/emmc_interrupt.c (renamed from drivers/renesas/rcar/emmc/emmc_interrupt.c)0
-rw-r--r--drivers/renesas/common/emmc/emmc_mount.c (renamed from drivers/renesas/rcar/emmc/emmc_mount.c)0
-rw-r--r--drivers/renesas/common/emmc/emmc_read.c (renamed from drivers/renesas/rcar/emmc/emmc_read.c)0
-rw-r--r--drivers/renesas/common/emmc/emmc_registers.h (renamed from drivers/renesas/rcar/emmc/emmc_registers.h)0
-rw-r--r--drivers/renesas/common/emmc/emmc_std.h (renamed from drivers/renesas/rcar/emmc/emmc_std.h)0
-rw-r--r--drivers/renesas/common/emmc/emmc_utility.c (renamed from drivers/renesas/rcar/emmc/emmc_utility.c)0
-rw-r--r--drivers/renesas/common/io/io_common.h (renamed from drivers/renesas/rcar/io/io_common.h)0
-rw-r--r--drivers/renesas/common/io/io_emmcdrv.c (renamed from drivers/renesas/rcar/io/io_emmcdrv.c)0
-rw-r--r--drivers/renesas/common/io/io_emmcdrv.h (renamed from drivers/renesas/rcar/io/io_emmcdrv.h)0
-rw-r--r--drivers/renesas/common/io/io_memdrv.c (renamed from drivers/renesas/rcar/io/io_memdrv.c)0
-rw-r--r--drivers/renesas/common/io/io_memdrv.h (renamed from drivers/renesas/rcar/io/io_memdrv.h)0
-rw-r--r--drivers/renesas/common/io/io_private.h (renamed from drivers/renesas/rcar/io/io_private.h)0
-rw-r--r--drivers/renesas/common/io/io_rcar.c (renamed from drivers/renesas/rcar/io/io_rcar.c)0
-rw-r--r--drivers/renesas/common/io/io_rcar.h (renamed from drivers/renesas/rcar/io/io_rcar.h)0
-rw-r--r--drivers/renesas/common/pfc_regs.h (renamed from drivers/renesas/rcar/pfc/pfc_regs.h)0
-rw-r--r--drivers/renesas/common/pwrc/call_sram.S (renamed from drivers/renesas/rcar/pwrc/call_sram.S)0
-rw-r--r--drivers/renesas/common/pwrc/pwrc.c (renamed from drivers/renesas/rcar/pwrc/pwrc.c)0
-rw-r--r--drivers/renesas/common/pwrc/pwrc.h (renamed from drivers/renesas/rcar/pwrc/pwrc.h)0
-rw-r--r--drivers/renesas/common/qos_reg.h (renamed from drivers/renesas/rcar/qos/qos_reg.h)0
-rw-r--r--drivers/renesas/common/rom/rom_api.c (renamed from drivers/renesas/rcar/rom/rom_api.c)0
-rw-r--r--drivers/renesas/common/rom/rom_api.h (renamed from drivers/renesas/rcar/rom/rom_api.h)0
-rw-r--r--drivers/renesas/common/rpc/rpc_driver.c (renamed from drivers/renesas/rcar/rpc/rpc_driver.c)0
-rw-r--r--drivers/renesas/common/rpc/rpc_registers.h (renamed from drivers/renesas/rcar/rpc/rpc_registers.h)0
-rw-r--r--drivers/renesas/common/scif/scif.S (renamed from drivers/renesas/rcar/scif/scif.S)0
-rw-r--r--drivers/renesas/common/watchdog/swdt.c (renamed from drivers/renesas/rcar/watchdog/swdt.c)0
-rw-r--r--plat/renesas/common/aarch64/plat_helpers.S (renamed from plat/renesas/rcar/aarch64/plat_helpers.S)0
-rw-r--r--plat/renesas/common/aarch64/platform_common.c (renamed from plat/renesas/rcar/aarch64/platform_common.c)0
-rw-r--r--plat/renesas/common/bl2_cpg_init.c (renamed from plat/renesas/rcar/bl2_cpg_init.c)0
-rw-r--r--plat/renesas/common/bl2_interrupt_error.c (renamed from plat/renesas/rcar/bl2_interrupt_error.c)0
-rw-r--r--plat/renesas/common/bl2_plat_mem_params_desc.c (renamed from plat/renesas/rcar/bl2_plat_mem_params_desc.c)0
-rw-r--r--plat/renesas/common/bl2_secure_setting.c (renamed from plat/renesas/rcar/bl2_secure_setting.c)0
-rw-r--r--plat/renesas/common/bl31_plat_setup.c (renamed from plat/renesas/rcar/bl31_plat_setup.c)0
-rw-r--r--plat/renesas/common/common.mk36
-rw-r--r--plat/renesas/common/plat_image_load.c (renamed from plat/renesas/rcar/plat_image_load.c)0
-rw-r--r--plat/renesas/common/plat_pm.c (renamed from plat/renesas/rcar/plat_pm.c)2
-rw-r--r--plat/renesas/common/plat_storage.c (renamed from plat/renesas/rcar/plat_storage.c)0
-rw-r--r--plat/renesas/common/plat_topology.c (renamed from plat/renesas/rcar/plat_topology.c)0
-rw-r--r--plat/renesas/rcar/platform.mk56
53 files changed, 48 insertions, 46 deletions
diff --git a/drivers/renesas/rcar/auth/auth_mod.c b/drivers/renesas/common/auth/auth_mod.c
index 4aa86e2a4a..4aa86e2a4a 100644
--- a/drivers/renesas/rcar/auth/auth_mod.c
+++ b/drivers/renesas/common/auth/auth_mod.c
diff --git a/drivers/renesas/rcar/avs/avs_driver.c b/drivers/renesas/common/avs/avs_driver.c
index 2c939cd59a..2c939cd59a 100644
--- a/drivers/renesas/rcar/avs/avs_driver.c
+++ b/drivers/renesas/common/avs/avs_driver.c
diff --git a/drivers/renesas/rcar/avs/avs_driver.h b/drivers/renesas/common/avs/avs_driver.h
index aa773b6041..aa773b6041 100644
--- a/drivers/renesas/rcar/avs/avs_driver.h
+++ b/drivers/renesas/common/avs/avs_driver.h
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/ddr/ddr_regs.h b/drivers/renesas/common/ddr_regs.h
index ba26c69c8b..ba26c69c8b 100644
--- a/drivers/renesas/rcar/ddr/ddr_regs.h
+++ b/drivers/renesas/common/ddr_regs.h
diff --git a/drivers/renesas/rcar/delay/micro_delay.c b/drivers/renesas/common/delay/micro_delay.c
index a5e2a69285..a5e2a69285 100644
--- a/drivers/renesas/rcar/delay/micro_delay.c
+++ b/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
index 37b71f80a6..37b71f80a6 100644
--- a/drivers/renesas/rcar/delay/micro_delay.h
+++ b/drivers/renesas/common/delay/micro_delay.h
diff --git a/drivers/renesas/rcar/dma/dma_driver.c b/drivers/renesas/common/dma/dma_driver.c
index 44ee985923..44ee985923 100644
--- a/drivers/renesas/rcar/dma/dma_driver.c
+++ b/drivers/renesas/common/dma/dma_driver.c
diff --git a/drivers/renesas/rcar/emmc/emmc_cmd.c b/drivers/renesas/common/emmc/emmc_cmd.c
index d255bffc9f..d255bffc9f 100644
--- a/drivers/renesas/rcar/emmc/emmc_cmd.c
+++ b/drivers/renesas/common/emmc/emmc_cmd.c
diff --git a/drivers/renesas/rcar/emmc/emmc_config.h b/drivers/renesas/common/emmc/emmc_config.h
index 16b6b8aa9a..16b6b8aa9a 100644
--- a/drivers/renesas/rcar/emmc/emmc_config.h
+++ b/drivers/renesas/common/emmc/emmc_config.h
diff --git a/drivers/renesas/rcar/emmc/emmc_def.h b/drivers/renesas/common/emmc/emmc_def.h
index 178c795b98..178c795b98 100644
--- a/drivers/renesas/rcar/emmc/emmc_def.h
+++ b/drivers/renesas/common/emmc/emmc_def.h
diff --git a/drivers/renesas/rcar/emmc/emmc_hal.h b/drivers/renesas/common/emmc/emmc_hal.h
index 0a8551719f..0a8551719f 100644
--- a/drivers/renesas/rcar/emmc/emmc_hal.h
+++ b/drivers/renesas/common/emmc/emmc_hal.h
diff --git a/drivers/renesas/rcar/emmc/emmc_init.c b/drivers/renesas/common/emmc/emmc_init.c
index 354aa3c82a..354aa3c82a 100644
--- a/drivers/renesas/rcar/emmc/emmc_init.c
+++ b/drivers/renesas/common/emmc/emmc_init.c
diff --git a/drivers/renesas/rcar/emmc/emmc_interrupt.c b/drivers/renesas/common/emmc/emmc_interrupt.c
index 092fdfb728..092fdfb728 100644
--- a/drivers/renesas/rcar/emmc/emmc_interrupt.c
+++ b/drivers/renesas/common/emmc/emmc_interrupt.c
diff --git a/drivers/renesas/rcar/emmc/emmc_mount.c b/drivers/renesas/common/emmc/emmc_mount.c
index e04afd4cf0..e04afd4cf0 100644
--- a/drivers/renesas/rcar/emmc/emmc_mount.c
+++ b/drivers/renesas/common/emmc/emmc_mount.c
diff --git a/drivers/renesas/rcar/emmc/emmc_read.c b/drivers/renesas/common/emmc/emmc_read.c
index 96e73ca56c..96e73ca56c 100644
--- a/drivers/renesas/rcar/emmc/emmc_read.c
+++ b/drivers/renesas/common/emmc/emmc_read.c
diff --git a/drivers/renesas/rcar/emmc/emmc_registers.h b/drivers/renesas/common/emmc/emmc_registers.h
index ae689ca24c..ae689ca24c 100644
--- a/drivers/renesas/rcar/emmc/emmc_registers.h
+++ b/drivers/renesas/common/emmc/emmc_registers.h
diff --git a/drivers/renesas/rcar/emmc/emmc_std.h b/drivers/renesas/common/emmc/emmc_std.h
index 087c6e91d8..087c6e91d8 100644
--- a/drivers/renesas/rcar/emmc/emmc_std.h
+++ b/drivers/renesas/common/emmc/emmc_std.h
diff --git a/drivers/renesas/rcar/emmc/emmc_utility.c b/drivers/renesas/common/emmc/emmc_utility.c
index 2e88abc75f..2e88abc75f 100644
--- a/drivers/renesas/rcar/emmc/emmc_utility.c
+++ b/drivers/renesas/common/emmc/emmc_utility.c
diff --git a/drivers/renesas/rcar/io/io_common.h b/drivers/renesas/common/io/io_common.h
index 6eb77777a9..6eb77777a9 100644
--- a/drivers/renesas/rcar/io/io_common.h
+++ b/drivers/renesas/common/io/io_common.h
diff --git a/drivers/renesas/rcar/io/io_emmcdrv.c b/drivers/renesas/common/io/io_emmcdrv.c
index c2b5f7c089..c2b5f7c089 100644
--- a/drivers/renesas/rcar/io/io_emmcdrv.c
+++ b/drivers/renesas/common/io/io_emmcdrv.c
diff --git a/drivers/renesas/rcar/io/io_emmcdrv.h b/drivers/renesas/common/io/io_emmcdrv.h
index 95070f24b6..95070f24b6 100644
--- a/drivers/renesas/rcar/io/io_emmcdrv.h
+++ b/drivers/renesas/common/io/io_emmcdrv.h
diff --git a/drivers/renesas/rcar/io/io_memdrv.c b/drivers/renesas/common/io/io_memdrv.c
index 1f31c0fb93..1f31c0fb93 100644
--- a/drivers/renesas/rcar/io/io_memdrv.c
+++ b/drivers/renesas/common/io/io_memdrv.c
diff --git a/drivers/renesas/rcar/io/io_memdrv.h b/drivers/renesas/common/io/io_memdrv.h
index 90e68123ee..90e68123ee 100644
--- a/drivers/renesas/rcar/io/io_memdrv.h
+++ b/drivers/renesas/common/io/io_memdrv.h
diff --git a/drivers/renesas/rcar/io/io_private.h b/drivers/renesas/common/io/io_private.h
index 207523a73e..207523a73e 100644
--- a/drivers/renesas/rcar/io/io_private.h
+++ b/drivers/renesas/common/io/io_private.h
diff --git a/drivers/renesas/rcar/io/io_rcar.c b/drivers/renesas/common/io/io_rcar.c
index c3e8319de4..c3e8319de4 100644
--- a/drivers/renesas/rcar/io/io_rcar.c
+++ b/drivers/renesas/common/io/io_rcar.c
diff --git a/drivers/renesas/rcar/io/io_rcar.h b/drivers/renesas/common/io/io_rcar.h
index c26a617678..c26a617678 100644
--- a/drivers/renesas/rcar/io/io_rcar.h
+++ b/drivers/renesas/common/io/io_rcar.h
diff --git a/drivers/renesas/rcar/pfc/pfc_regs.h b/drivers/renesas/common/pfc_regs.h
index 418773366c..418773366c 100644
--- a/drivers/renesas/rcar/pfc/pfc_regs.h
+++ b/drivers/renesas/common/pfc_regs.h
diff --git a/drivers/renesas/rcar/pwrc/call_sram.S b/drivers/renesas/common/pwrc/call_sram.S
index aa8644cb98..aa8644cb98 100644
--- a/drivers/renesas/rcar/pwrc/call_sram.S
+++ b/drivers/renesas/common/pwrc/call_sram.S
diff --git a/drivers/renesas/rcar/pwrc/pwrc.c b/drivers/renesas/common/pwrc/pwrc.c
index c0f015f04b..c0f015f04b 100644
--- a/drivers/renesas/rcar/pwrc/pwrc.c
+++ b/drivers/renesas/common/pwrc/pwrc.c
diff --git a/drivers/renesas/rcar/pwrc/pwrc.h b/drivers/renesas/common/pwrc/pwrc.h
index f73099b0b5..f73099b0b5 100644
--- a/drivers/renesas/rcar/pwrc/pwrc.h
+++ b/drivers/renesas/common/pwrc/pwrc.h
diff --git a/drivers/renesas/rcar/qos/qos_reg.h b/drivers/renesas/common/qos_reg.h
index f2012fa45f..f2012fa45f 100644
--- a/drivers/renesas/rcar/qos/qos_reg.h
+++ b/drivers/renesas/common/qos_reg.h
diff --git a/drivers/renesas/rcar/rom/rom_api.c b/drivers/renesas/common/rom/rom_api.c
index fda28150e9..fda28150e9 100644
--- a/drivers/renesas/rcar/rom/rom_api.c
+++ b/drivers/renesas/common/rom/rom_api.c
diff --git a/drivers/renesas/rcar/rom/rom_api.h b/drivers/renesas/common/rom/rom_api.h
index 1d5b03d7f5..1d5b03d7f5 100644
--- a/drivers/renesas/rcar/rom/rom_api.h
+++ b/drivers/renesas/common/rom/rom_api.h
diff --git a/drivers/renesas/rcar/rpc/rpc_driver.c b/drivers/renesas/common/rpc/rpc_driver.c
index 63de5b851a..63de5b851a 100644
--- a/drivers/renesas/rcar/rpc/rpc_driver.c
+++ b/drivers/renesas/common/rpc/rpc_driver.c
diff --git a/drivers/renesas/rcar/rpc/rpc_registers.h b/drivers/renesas/common/rpc/rpc_registers.h
index 79aea85990..79aea85990 100644
--- a/drivers/renesas/rcar/rpc/rpc_registers.h
+++ b/drivers/renesas/common/rpc/rpc_registers.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/drivers/renesas/rcar/watchdog/swdt.c b/drivers/renesas/common/watchdog/swdt.c
index 05987ab704..05987ab704 100644
--- a/drivers/renesas/rcar/watchdog/swdt.c
+++ b/drivers/renesas/common/watchdog/swdt.c
diff --git a/plat/renesas/rcar/aarch64/plat_helpers.S b/plat/renesas/common/aarch64/plat_helpers.S
index ec21f2510c..ec21f2510c 100644
--- a/plat/renesas/rcar/aarch64/plat_helpers.S
+++ b/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
index b0a88cb6b1..b0a88cb6b1 100644
--- a/plat/renesas/rcar/aarch64/platform_common.c
+++ b/plat/renesas/common/aarch64/platform_common.c
diff --git a/plat/renesas/rcar/bl2_cpg_init.c b/plat/renesas/common/bl2_cpg_init.c
index 1754344698..1754344698 100644
--- a/plat/renesas/rcar/bl2_cpg_init.c
+++ b/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
index d9a4b8e628..d9a4b8e628 100644
--- a/plat/renesas/rcar/bl2_interrupt_error.c
+++ b/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
index bf2706d53f..bf2706d53f 100644
--- a/plat/renesas/rcar/bl2_plat_mem_params_desc.c
+++ b/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
index 095d1f62a8..095d1f62a8 100644
--- a/plat/renesas/rcar/bl2_secure_setting.c
+++ b/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
index 93798acfbc..93798acfbc 100644
--- a/plat/renesas/rcar/bl31_plat_setup.c
+++ b/plat/renesas/common/bl31_plat_setup.c
diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk
index ab9cded708..cadb3d7644 100644
--- a/plat/renesas/common/common.mk
+++ b/plat/renesas/common/common.mk
@@ -78,13 +78,49 @@ 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 \
+ 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 \
+ drivers/renesas/common/io/io_emmcdrv.c \
+ drivers/renesas/common/io/io_memdrv.c \
+ drivers/renesas/common/io/io_rcar.c \
+ drivers/renesas/common/auth/auth_mod.c \
+ drivers/renesas/common/rpc/rpc_driver.c \
+ drivers/renesas/common/dma/dma_driver.c \
+ drivers/renesas/common/avs/avs_driver.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 \
+ drivers/renesas/common/emmc/emmc_init.c \
+ drivers/renesas/common/emmc/emmc_read.c \
+ drivers/renesas/common/emmc/emmc_cmd.c \
+ drivers/renesas/common/watchdog/swdt.c \
+ drivers/renesas/common/rom/rom_api.c \
drivers/io/io_storage.c
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/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 \
+ drivers/renesas/common/pwrc/call_sram.S \
+ drivers/renesas/common/pwrc/pwrc.c \
drivers/renesas/common/common.c \
drivers/arm/cci/cci.c
diff --git a/plat/renesas/rcar/plat_image_load.c b/plat/renesas/common/plat_image_load.c
index 9d814a6e59..9d814a6e59 100644
--- a/plat/renesas/rcar/plat_image_load.c
+++ b/plat/renesas/common/plat_image_load.c
diff --git a/plat/renesas/rcar/plat_pm.c b/plat/renesas/common/plat_pm.c
index 7ec78cce32..6a9ad450d5 100644
--- a/plat/renesas/rcar/plat_pm.c
+++ b/plat/renesas/common/plat_pm.c
@@ -21,7 +21,9 @@
#include "pwrc.h"
#include "rcar_def.h"
#include "rcar_private.h"
+#if RCAR_GEN3_ULCB
#include "ulcb_cpld.h"
+#endif /* RCAR_GEN3_ULCB */
#define DVFS_SET_VID_0V (0x00)
#define P_ALL_OFF (0x80)
diff --git a/plat/renesas/rcar/plat_storage.c b/plat/renesas/common/plat_storage.c
index 6524561031..6524561031 100644
--- a/plat/renesas/rcar/plat_storage.c
+++ b/plat/renesas/common/plat_storage.c
diff --git a/plat/renesas/rcar/plat_topology.c b/plat/renesas/common/plat_topology.c
index 0d5880d7a2..0d5880d7a2 100644
--- a/plat/renesas/rcar/plat_topology.c
+++ b/plat/renesas/common/plat_topology.c
diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk
index 8613f5ea21..5e4978c0a0 100644
--- a/plat/renesas/rcar/platform.mk
+++ b/plat/renesas/rcar/platform.mk
@@ -302,55 +302,19 @@ PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \
-Idrivers/renesas/rcar/qos \
-Idrivers/renesas/rcar/board \
-Idrivers/renesas/rcar/cpld/ \
+ -Idrivers/renesas/common \
-Idrivers/renesas/common/iic_dvfs \
- -Idrivers/renesas/rcar/avs \
- -Idrivers/renesas/rcar/delay \
- -Idrivers/renesas/rcar/rom \
- -Idrivers/renesas/rcar/scif \
- -Idrivers/renesas/rcar/emmc \
- -Idrivers/renesas/rcar/pwrc \
- -Idrivers/renesas/rcar/io
-
-BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \
- plat/renesas/rcar/aarch64/plat_helpers.S \
- 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 \
- drivers/renesas/rcar/console/rcar_printf.c \
- drivers/renesas/rcar/scif/scif.S \
- drivers/renesas/rcar/io/io_emmcdrv.c \
- drivers/renesas/rcar/io/io_memdrv.c \
- drivers/renesas/rcar/io/io_rcar.c \
- drivers/renesas/rcar/auth/auth_mod.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/emmc/emmc_interrupt.c \
- drivers/renesas/rcar/emmc/emmc_utility.c \
- drivers/renesas/rcar/emmc/emmc_mount.c \
- drivers/renesas/rcar/emmc/emmc_init.c \
- drivers/renesas/rcar/emmc/emmc_read.c \
- drivers/renesas/rcar/emmc/emmc_cmd.c \
- drivers/renesas/rcar/watchdog/swdt.c \
- drivers/renesas/rcar/rom/rom_api.c \
+ -Idrivers/renesas/common/avs \
+ -Idrivers/renesas/common/delay \
+ -Idrivers/renesas/common/rom \
+ -Idrivers/renesas/common/scif \
+ -Idrivers/renesas/common/emmc \
+ -Idrivers/renesas/common/pwrc \
+ -Idrivers/renesas/common/io
+
+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/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/console/rcar_console.S \
- drivers/renesas/rcar/console/rcar_printf.c \
- drivers/renesas/rcar/delay/micro_delay.c \
- drivers/renesas/rcar/pwrc/call_sram.S \
- drivers/renesas/rcar/pwrc/pwrc.c
-
ifeq (${RCAR_GEN3_ULCB},1)
BL31_SOURCES += drivers/renesas/rcar/cpld/ulcb_cpld.c
endif