Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-11 07:24:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: renesas: Simplify board Makefiles

Browse source 
Introduce board/renesas/common/Makefile and remove the multiple
duplicate copies of obj := ../common/*.o from board Makefiles.
Let the build system include the common Makefile using the
HAVE_VENDOR_COMMON_LIB and build the common objects that are
shared by all the boards that way. No functional change intended.

Some of the remaining board files which include board specific
settings have been updated to use obj-y += to avoid rewriting
the board obj-y target and avoid dropping object files from the
build.

The board/renesas/common/Makefile is now also used when building
RZG2L targets which also set CONFIG_RCAR_64 symbol and 32bit R-Car
Gen2 targets, however, this common code is specific to 64bit R-Car
only. Inhibit the build of this common code for RZG2L using extra
ifndef CONFIG_RZG2L and do not include any code for R-Car Gen2 so
far.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
This commit is contained in:
Marek Vasut 2025-01-29 18:04:28 +01:00
parent 5a287cf07a
commit c7d2d7f90a
15 changed files with 55 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
board/renesas/common/Makefile
View file

@ -0,0 +1,47 @@
#
# board/renesas/whitehawk/Makefile
#
# Copyright (C) 2024 Marek Vasut <marek.vasut+renesas@mailbox.org>
#
# SPDX-License-Identifier: GPL-2.0+
#
# R-Car SoCs
ifndef CONFIG_RZG2L
# 32 bit SoCs
ifdef CONFIG_RCAR_32
ifdef CONFIG_RCAR_GEN2
endif
endif
# 64 bit SoCs
ifdef CONFIG_RCAR_64
ifndef CONFIG_XPL_BUILD
obj-y += common.o
endif
ifdef CONFIG_RCAR_GEN3
ifdef CONFIG_XPL_BUILD
obj-y += gen3-spl.o
else
obj-y += gen3-common.o
ifdef CONFIG_R8A77970
obj-y += v3-common.o
endif
ifdef CONFIG_R8A77980
obj-y += v3-common.o
endif
endif
endif
ifdef CONFIG_RCAR_GEN4
ifdef CONFIG_XPL_BUILD
obj-y += gen4-spl.o
else
obj-y += gen4-common.o
endif
endif
endif
endif

4
board/renesas/common/common.c
View file

@ -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

3
board/renesas/common/gen3-common.c
View file

@ -18,8 +18,6 @@
#include <asm/arch/renesas.h>
#include <linux/libfdt.h>
#ifdef CONFIG_RCAR_64
DECLARE_GLOBAL_DATA_PTR;
/* If the firmware passed a device tree use it for e.g. U-Boot DRAM setup. */
@ -178,4 +176,3 @@ int ft_board_setup(void *blob, struct bd_info *bd)
return 0;
}
#endif
#endif

13
board/renesas/condor/Makefile
View file

@ -1,13 +0,0 @@
#
# board/renesas/condor/Makefile
#
# Copyright (C) 2019 Renesas Electronics Corporation
#
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_XPL_BUILD
obj-y := ../common/gen3-spl.o
else
obj-y := ../common/gen3-common.o ../common/common.o
endif

6
board/renesas/draak/Makefile
View file

@ -6,8 +6,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_XPL_BUILD
obj-y := ../common/gen3-spl.o
else
obj-y := draak.o ../common/gen3-common.o ../common/common.o
ifndef CONFIG_XPL_BUILD
obj-y += draak.o
endif

13
board/renesas/eagle/Makefile
View file

@ -1,13 +0,0 @@
#
# board/renesas/eagle/Makefile
#
# Copyright (C) 2015 Renesas Electronics Corporation
#
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_XPL_BUILD
obj-y := ../common/gen3-spl.o
else
obj-y := ../common/v3-common.o ../common/gen3-common.o ../common/common.o
endif

13
board/renesas/ebisu/Makefile
View file

@ -1,13 +0,0 @@
#
# board/renesas/ebisu/Makefile
#
# Copyright (C) 2018 Renesas Electronics Corporation
#
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_XPL_BUILD
obj-y := ../common/gen3-spl.o
else
obj-y := ../common/gen3-common.o ../common/common.o
endif

11
board/renesas/falcon/Makefile
View file

@ -1,11 +0,0 @@
#
# board/renesas/falcon/Makefile
#
# Copyright (C) 2020 Renesas Electronics Corp.
#
# SPDX-License-Identifier: GPL-2.0+
#
ifndef CONFIG_XPL_BUILD
obj-y := ../common/gen4-common.o ../common/common.o
endif

9
board/renesas/grayhawk/Makefile
View file

@ -1,9 +0,0 @@
#
# board/renesas/grayhawk/Makefile
#
# Copyright (C) 2023 Renesas Electronics Corp.
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y := ../common/gen4-common.o ../common/common.o

6
board/renesas/salvator-x/Makefile
View file

@ -6,8 +6,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_XPL_BUILD
obj-y := ../common/gen3-spl.o
else
obj-y := salvator-x.o ../common/gen3-common.o ../common/common.o
ifndef CONFIG_XPL_BUILD
obj-y += salvator-x.o
endif

9
board/renesas/spider/Makefile
View file

@ -1,9 +0,0 @@
#
# board/renesas/spider/Makefile
#
# Copyright (C) 2020 Renesas Electronics Corp.
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y := ../common/gen4-common.o ../common/common.o

6
board/renesas/ulcb/Makefile
View file

@ -6,8 +6,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_XPL_BUILD
obj-y := ../common/gen3-spl.o
else
obj-y := ulcb.o cpld.o ../common/gen3-common.o ../common/common.o
ifndef CONFIG_XPL_BUILD
obj-y += ulcb.o cpld.o
endif

5
board/renesas/v3hsk/Makefile
View file

@ -7,9 +7,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_XPL_BUILD
obj-y := ../common/gen3-spl.o
else
obj-y := ../common/v3-common.o ../common/gen3-common.o ../common/common.o
ifndef CONFIG_XPL_BUILD
obj-$(CONFIG_SYSRESET) += cpld.o
endif

5
board/renesas/v3msk/Makefile
View file

@ -7,9 +7,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_XPL_BUILD
obj-y := ../common/gen3-spl.o
else
obj-y := ../common/v3-common.o ../common/gen3-common.o ../common/common.o
ifndef CONFIG_XPL_BUILD
obj-$(CONFIG_SYSRESET) += cpld.o
endif

13
board/renesas/whitehawk/Makefile
View file

@ -1,13 +0,0 @@
#
# board/renesas/whitehawk/Makefile
#
# Copyright (C) 2021 Renesas Electronics Corp.
#
# SPDX-License-Identifier: GPL-2.0+
#
ifdef CONFIG_SPL_BUILD
obj-y := ../common/gen4-spl.o
else
obj-y := ../common/gen4-common.o ../common/common.o
endif