The common.c content is specific to 64-bit R-Car SoCs, rename the file to rcar64-common.c and remove R-Car 64-bit ifdeffery in the file. No functional change.
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Adam Ford aford173@gmail.com Cc: Biju Das biju.das.jz@bp.renesas.com Cc: Lad Prabhakar prabhakar.mahadev-lad.rj@bp.renesas.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org Cc: Paul Barker paul.barker.ct@bp.renesas.com Cc: Simon Glass sjg@chromium.org Cc: Tom Rini trini@konsulko.com Cc: u-boot@lists.denx.de --- board/beacon/beacon-rzg2m/Makefile | 2 +- board/hoperun/hihope-rzg2/Makefile | 2 +- board/renesas/common/Makefile | 2 +- board/renesas/common/{common.c => rcar64-common.c} | 4 ---- board/silinux/ek874/Makefile | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) rename board/renesas/common/{common.c => rcar64-common.c} (97%)
diff --git a/board/beacon/beacon-rzg2m/Makefile b/board/beacon/beacon-rzg2m/Makefile index 6a6ae94def8..10b7a7fbfa9 100644 --- a/board/beacon/beacon-rzg2m/Makefile +++ b/board/beacon/beacon-rzg2m/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ #
-obj-y := beacon-rzg2m.o ../../renesas/common/gen3-common.o ../../renesas/common/common.o +obj-y := beacon-rzg2m.o ../../renesas/common/gen3-common.o ../../renesas/common/rcar64-common.o diff --git a/board/hoperun/hihope-rzg2/Makefile b/board/hoperun/hihope-rzg2/Makefile index a42c55b9d00..299769c9cb6 100644 --- a/board/hoperun/hihope-rzg2/Makefile +++ b/board/hoperun/hihope-rzg2/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ #
-obj-y := hihope-rzg2.o ../../renesas/common/gen3-common.o ../../renesas/common/common.o +obj-y := hihope-rzg2.o ../../renesas/common/gen3-common.o ../../renesas/common/rcar64-common.o diff --git a/board/renesas/common/Makefile b/board/renesas/common/Makefile index 2072338ea05..e6dde3c2597 100644 --- a/board/renesas/common/Makefile +++ b/board/renesas/common/Makefile @@ -16,7 +16,7 @@ endif # 64 bit SoCs ifdef CONFIG_RCAR_64 ifndef CONFIG_XPL_BUILD -obj-y += common.o +obj-y += rcar64-common.o endif
ifdef CONFIG_RCAR_GEN3 diff --git a/board/renesas/common/common.c b/board/renesas/common/rcar64-common.c similarity index 97% rename from board/renesas/common/common.c rename to board/renesas/common/rcar64-common.c index 7fba8d10ff5..74ec0a46e6f 100644 --- a/board/renesas/common/common.c +++ b/board/renesas/common/rcar64-common.c @@ -18,8 +18,6 @@ #include <asm/system.h> #include <linux/libfdt.h>
-#ifdef CONFIG_RCAR_64 - DECLARE_GLOBAL_DATA_PTR;
int dram_init(void) @@ -67,5 +65,3 @@ int __weak board_init(void) { return 0; } - -#endif diff --git a/board/silinux/ek874/Makefile b/board/silinux/ek874/Makefile index c1cab6fa788..0beda63d115 100644 --- a/board/silinux/ek874/Makefile +++ b/board/silinux/ek874/Makefile @@ -9,5 +9,5 @@ ifdef CONFIG_XPL_BUILD obj-y := ../../renesas/common/gen3-spl.o else -obj-y := ek874.o ../../renesas/common/gen3-common.o ../../renesas/common/common.o +obj-y := ek874.o ../../renesas/common/gen3-common.o ../../renesas/common/rcar64-common.o endif