Rename directory board/renesas/rcar-common to board/renesas/common and move files. This allows the build system to use HAVE_VENDOR_COMMON_LIB which automatically includes board/$(VENDOR)/common/Makefile . This is a preparatory patch for board Makefile simplification. No functional change so far.
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/{rcar-common => common}/common.c | 2 +- board/renesas/{rcar-common => common}/gen3-common.c | 2 +- board/renesas/{rcar-common => common}/gen3-spl.c | 0 board/renesas/{rcar-common => common}/gen4-common.c | 2 +- board/renesas/{rcar-common => common}/gen4-spl.c | 0 board/renesas/{rcar-common => common}/v3-common.c | 0 board/renesas/condor/Makefile | 4 ++-- board/renesas/draak/Makefile | 4 ++-- board/renesas/eagle/Makefile | 4 ++-- board/renesas/ebisu/Makefile | 4 ++-- board/renesas/falcon/Makefile | 4 ++-- board/renesas/grayhawk/Makefile | 2 +- board/renesas/salvator-x/Makefile | 4 ++-- board/renesas/spider/Makefile | 2 +- board/renesas/ulcb/Makefile | 4 ++-- board/renesas/v3hsk/Makefile | 4 ++-- board/renesas/v3msk/Makefile | 4 ++-- board/renesas/whitehawk/Makefile | 4 ++-- board/silinux/ek874/Makefile | 4 ++-- 21 files changed, 29 insertions(+), 29 deletions(-) rename board/renesas/{rcar-common => common}/common.c (97%) rename board/renesas/{rcar-common => common}/gen3-common.c (99%) rename board/renesas/{rcar-common => common}/gen3-spl.c (100%) rename board/renesas/{rcar-common => common}/gen4-common.c (97%) rename board/renesas/{rcar-common => common}/gen4-spl.c (100%) rename board/renesas/{rcar-common => common}/v3-common.c (100%)
diff --git a/board/beacon/beacon-rzg2m/Makefile b/board/beacon/beacon-rzg2m/Makefile index 332b41f35c0..6a6ae94def8 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/rcar-common/gen3-common.o ../../renesas/rcar-common/common.o +obj-y := beacon-rzg2m.o ../../renesas/common/gen3-common.o ../../renesas/common/common.o diff --git a/board/hoperun/hihope-rzg2/Makefile b/board/hoperun/hihope-rzg2/Makefile index 700e26daa2b..a42c55b9d00 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/rcar-common/gen3-common.o ../../renesas/rcar-common/common.o +obj-y := hihope-rzg2.o ../../renesas/common/gen3-common.o ../../renesas/common/common.o diff --git a/board/renesas/rcar-common/common.c b/board/renesas/common/common.c similarity index 97% rename from board/renesas/rcar-common/common.c rename to board/renesas/common/common.c index 90eb468e4c4..7fba8d10ff5 100644 --- a/board/renesas/rcar-common/common.c +++ b/board/renesas/common/common.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * board/renesas/rcar-common/common.c + * board/renesas/common/common.c * * Copyright (C) 2013 Renesas Electronics Corporation * Copyright (C) 2013 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com diff --git a/board/renesas/rcar-common/gen3-common.c b/board/renesas/common/gen3-common.c similarity index 99% rename from board/renesas/rcar-common/gen3-common.c rename to board/renesas/common/gen3-common.c index 4291e1d5bcb..549bec9e137 100644 --- a/board/renesas/rcar-common/gen3-common.c +++ b/board/renesas/common/gen3-common.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * board/renesas/rcar-common/gen3-common.c + * board/renesas/common/gen3-common.c * * Copyright (C) 2013 Renesas Electronics Corporation * Copyright (C) 2013 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com diff --git a/board/renesas/rcar-common/gen3-spl.c b/board/renesas/common/gen3-spl.c similarity index 100% rename from board/renesas/rcar-common/gen3-spl.c rename to board/renesas/common/gen3-spl.c diff --git a/board/renesas/rcar-common/gen4-common.c b/board/renesas/common/gen4-common.c similarity index 97% rename from board/renesas/rcar-common/gen4-common.c rename to board/renesas/common/gen4-common.c index 2abe9660cf8..52a0639073b 100644 --- a/board/renesas/rcar-common/gen4-common.c +++ b/board/renesas/common/gen4-common.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * board/renesas/rcar-common/gen4-common.c + * board/renesas/common/gen4-common.c * * Copyright (C) 2021-2024 Renesas Electronics Corp. */ diff --git a/board/renesas/rcar-common/gen4-spl.c b/board/renesas/common/gen4-spl.c similarity index 100% rename from board/renesas/rcar-common/gen4-spl.c rename to board/renesas/common/gen4-spl.c diff --git a/board/renesas/rcar-common/v3-common.c b/board/renesas/common/v3-common.c similarity index 100% rename from board/renesas/rcar-common/v3-common.c rename to board/renesas/common/v3-common.c diff --git a/board/renesas/condor/Makefile b/board/renesas/condor/Makefile index fe3a2fd3b7a..3b1756b44cd 100644 --- a/board/renesas/condor/Makefile +++ b/board/renesas/condor/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := ../rcar-common/gen3-common.o ../rcar-common/common.o +obj-y := ../common/gen3-common.o ../common/common.o endif diff --git a/board/renesas/draak/Makefile b/board/renesas/draak/Makefile index 3ed7800b0e9..6ce05bcd649 100644 --- a/board/renesas/draak/Makefile +++ b/board/renesas/draak/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := draak.o ../rcar-common/gen3-common.o ../rcar-common/common.o +obj-y := draak.o ../common/gen3-common.o ../common/common.o endif diff --git a/board/renesas/eagle/Makefile b/board/renesas/eagle/Makefile index 3f5fdab1bc2..a5c18d81eef 100644 --- a/board/renesas/eagle/Makefile +++ b/board/renesas/eagle/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := ../rcar-common/v3-common.o ../rcar-common/gen3-common.o ../rcar-common/common.o +obj-y := ../common/v3-common.o ../common/gen3-common.o ../common/common.o endif diff --git a/board/renesas/ebisu/Makefile b/board/renesas/ebisu/Makefile index 8139391029d..72130b76234 100644 --- a/board/renesas/ebisu/Makefile +++ b/board/renesas/ebisu/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := ../rcar-common/gen3-common.o ../rcar-common/common.o +obj-y := ../common/gen3-common.o ../common/common.o endif diff --git a/board/renesas/falcon/Makefile b/board/renesas/falcon/Makefile index 48fcfac9105..949953f6981 100644 --- a/board/renesas/falcon/Makefile +++ b/board/renesas/falcon/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := ../rcar-common/gen4-common.o ../rcar-common/common.o +obj-y := ../common/gen4-common.o ../common/common.o endif diff --git a/board/renesas/grayhawk/Makefile b/board/renesas/grayhawk/Makefile index 7414b773326..a70bd3739f1 100644 --- a/board/renesas/grayhawk/Makefile +++ b/board/renesas/grayhawk/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ #
-obj-y := ../rcar-common/gen4-common.o ../rcar-common/common.o +obj-y := ../common/gen4-common.o ../common/common.o diff --git a/board/renesas/salvator-x/Makefile b/board/renesas/salvator-x/Makefile index fe7c78ef2ff..fe53366829c 100644 --- a/board/renesas/salvator-x/Makefile +++ b/board/renesas/salvator-x/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := salvator-x.o ../rcar-common/gen3-common.o ../rcar-common/common.o +obj-y := salvator-x.o ../common/gen3-common.o ../common/common.o endif diff --git a/board/renesas/spider/Makefile b/board/renesas/spider/Makefile index 9489917278c..e0f403d5fcc 100644 --- a/board/renesas/spider/Makefile +++ b/board/renesas/spider/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ #
-obj-y := ../rcar-common/gen4-common.o ../rcar-common/common.o +obj-y := ../common/gen4-common.o ../common/common.o diff --git a/board/renesas/ulcb/Makefile b/board/renesas/ulcb/Makefile index c3c2f391e55..6b2aa8c29f6 100644 --- a/board/renesas/ulcb/Makefile +++ b/board/renesas/ulcb/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := ulcb.o cpld.o ../rcar-common/gen3-common.o ../rcar-common/common.o +obj-y := ulcb.o cpld.o ../common/gen3-common.o ../common/common.o endif diff --git a/board/renesas/v3hsk/Makefile b/board/renesas/v3hsk/Makefile index ee04f67d986..936047cb3d5 100644 --- a/board/renesas/v3hsk/Makefile +++ b/board/renesas/v3hsk/Makefile @@ -8,8 +8,8 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := ../rcar-common/v3-common.o ../rcar-common/gen3-common.o ../rcar-common/common.o +obj-y := ../common/v3-common.o ../common/gen3-common.o ../common/common.o obj-$(CONFIG_SYSRESET) += cpld.o endif diff --git a/board/renesas/v3msk/Makefile b/board/renesas/v3msk/Makefile index 63e06a4b5fd..21eaddb6c28 100644 --- a/board/renesas/v3msk/Makefile +++ b/board/renesas/v3msk/Makefile @@ -8,8 +8,8 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../rcar-common/gen3-spl.o +obj-y := ../common/gen3-spl.o else -obj-y := ../rcar-common/v3-common.o ../rcar-common/gen3-common.o ../rcar-common/common.o +obj-y := ../common/v3-common.o ../common/gen3-common.o ../common/common.o obj-$(CONFIG_SYSRESET) += cpld.o endif diff --git a/board/renesas/whitehawk/Makefile b/board/renesas/whitehawk/Makefile index 80f92e6b041..f10eb82d221 100644 --- a/board/renesas/whitehawk/Makefile +++ b/board/renesas/whitehawk/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_SPL_BUILD -obj-y := ../rcar-common/gen4-spl.o +obj-y := ../common/gen4-spl.o else -obj-y := ../rcar-common/gen4-common.o ../rcar-common/common.o +obj-y := ../common/gen4-common.o ../common/common.o endif diff --git a/board/silinux/ek874/Makefile b/board/silinux/ek874/Makefile index 879da9edacf..c1cab6fa788 100644 --- a/board/silinux/ek874/Makefile +++ b/board/silinux/ek874/Makefile @@ -7,7 +7,7 @@ #
ifdef CONFIG_XPL_BUILD -obj-y := ../../renesas/rcar-common/gen3-spl.o +obj-y := ../../renesas/common/gen3-spl.o else -obj-y := ek874.o ../../renesas/rcar-common/gen3-common.o ../../renesas/rcar-common/common.o +obj-y := ek874.o ../../renesas/common/gen3-common.o ../../renesas/common/common.o endif