From be92e5a22f83fe5e580b4c60148ec9b150b82c23 Mon Sep 17 00:00:00 2001 From: Biju Das Date: Wed, 16 Dec 2020 09:43:41 +0000 Subject: [PATCH] drivers: renesas: Move plat common sources Move plat common sources to common directory, so that 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: Id2b1822c97cc50e3febaffc2e5f42b4d53809a17 --- drivers/renesas/{rcar => common}/iic_dvfs/iic_dvfs.c | 0 drivers/renesas/{rcar => common}/iic_dvfs/iic_dvfs.h | 0 plat/renesas/common/common.mk | 7 +++++++ plat/renesas/{rcar => common}/rcar_common.c | 0 plat/renesas/rcar/platform.mk | 9 +-------- 5 files changed, 8 insertions(+), 8 deletions(-) rename drivers/renesas/{rcar => common}/iic_dvfs/iic_dvfs.c (100%) rename drivers/renesas/{rcar => common}/iic_dvfs/iic_dvfs.h (100%) rename plat/renesas/{rcar => common}/rcar_common.c (100%) diff --git a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c b/drivers/renesas/common/iic_dvfs/iic_dvfs.c similarity index 100% rename from drivers/renesas/rcar/iic_dvfs/iic_dvfs.c rename to drivers/renesas/common/iic_dvfs/iic_dvfs.c diff --git a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h b/drivers/renesas/common/iic_dvfs/iic_dvfs.h similarity index 100% rename from drivers/renesas/rcar/iic_dvfs/iic_dvfs.h rename to drivers/renesas/common/iic_dvfs/iic_dvfs.h diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index f2e1112a6..ab9cded70 100644 --- a/plat/renesas/common/common.mk +++ b/plat/renesas/common/common.mk @@ -65,6 +65,9 @@ PLAT_INCLUDES := -Iplat/renesas/common/include/registers \ -Iplat/renesas/common/include \ -Iplat/renesas/common +PLAT_BL_COMMON_SOURCES := drivers/renesas/common/iic_dvfs/iic_dvfs.c \ + plat/renesas/common/rcar_common.c + RCAR_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ drivers/arm/gic/v2/gicv2_main.c \ drivers/arm/gic/v2/gicv2_helpers.c \ @@ -84,3 +87,7 @@ BL31_SOURCES += ${RCAR_GIC_SOURCES} \ plat/common/plat_psci_common.c \ drivers/renesas/common/common.c \ drivers/arm/cci/cci.c + +include lib/xlat_tables_v2/xlat_tables.mk +include drivers/auth/mbedtls/mbedtls_crypto.mk +PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS} diff --git a/plat/renesas/rcar/rcar_common.c b/plat/renesas/common/rcar_common.c similarity index 100% rename from plat/renesas/rcar/rcar_common.c rename to plat/renesas/common/rcar_common.c diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index bdc29fe35..8613f5ea2 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -300,9 +300,9 @@ include lib/libfdt/libfdt.mk PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/rcar/qos \ - -Idrivers/renesas/rcar/iic_dvfs \ -Idrivers/renesas/rcar/board \ -Idrivers/renesas/rcar/cpld/ \ + -Idrivers/renesas/common/iic_dvfs \ -Idrivers/renesas/rcar/avs \ -Idrivers/renesas/rcar/delay \ -Idrivers/renesas/rcar/rom \ @@ -311,9 +311,6 @@ PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/rcar/pwrc \ -Idrivers/renesas/rcar/io -PLAT_BL_COMMON_SOURCES := drivers/renesas/rcar/iic_dvfs/iic_dvfs.c \ - plat/renesas/rcar/rcar_common.c - BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \ plat/renesas/rcar/aarch64/plat_helpers.S \ plat/renesas/rcar/bl2_interrupt_error.c \ @@ -358,10 +355,6 @@ ifeq (${RCAR_GEN3_ULCB},1) BL31_SOURCES += drivers/renesas/rcar/cpld/ulcb_cpld.c endif -include lib/xlat_tables_v2/xlat_tables.mk -include drivers/auth/mbedtls/mbedtls_crypto.mk -PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS} - # build the layout images for the bootrom and the necessary srecords rcar: rcar_layout_tool rcar_srecord distclean realclean clean: clean_layout_tool clean_srecord -- 2.39.5