summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/renesas/common/Makefile47
-rw-r--r--board/renesas/common/common.c4
-rw-r--r--board/renesas/common/gen3-common.c3
-rw-r--r--board/renesas/condor/Makefile13
-rw-r--r--board/renesas/draak/Makefile6
-rw-r--r--board/renesas/eagle/Makefile13
-rw-r--r--board/renesas/ebisu/Makefile13
-rw-r--r--board/renesas/falcon/Makefile11
-rw-r--r--board/renesas/grayhawk/Makefile9
-rw-r--r--board/renesas/salvator-x/Makefile6
-rw-r--r--board/renesas/spider/Makefile9
-rw-r--r--board/renesas/ulcb/Makefile6
-rw-r--r--board/renesas/v3hsk/Makefile5
-rw-r--r--board/renesas/v3msk/Makefile5
-rw-r--r--board/renesas/whitehawk/Makefile13
15 files changed, 55 insertions, 108 deletions
diff --git a/board/renesas/common/Makefile b/board/renesas/common/Makefile
index e69de29bb2d..c531738b22e 100644
--- a/board/renesas/common/Makefile
+++ b/board/renesas/common/Makefile
@@ -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
diff --git a/board/renesas/common/common.c b/board/renesas/common/common.c
index 7fba8d10ff5..74ec0a46e6f 100644
--- a/board/renesas/common/common.c
+++ b/board/renesas/common/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/renesas/common/gen3-common.c b/board/renesas/common/gen3-common.c
index 05b01c846c6..94da00985d3 100644
--- a/board/renesas/common/gen3-common.c
+++ b/board/renesas/common/gen3-common.c
@@ -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
diff --git a/board/renesas/condor/Makefile b/board/renesas/condor/Makefile
deleted file mode 100644
index 3b1756b44cd..00000000000
--- a/board/renesas/condor/Makefile
+++ /dev/null
@@ -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
diff --git a/board/renesas/draak/Makefile b/board/renesas/draak/Makefile
index 6ce05bcd649..0a6a325d761 100644
--- a/board/renesas/draak/Makefile
+++ b/board/renesas/draak/Makefile
@@ -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
diff --git a/board/renesas/eagle/Makefile b/board/renesas/eagle/Makefile
deleted file mode 100644
index a5c18d81eef..00000000000
--- a/board/renesas/eagle/Makefile
+++ /dev/null
@@ -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
diff --git a/board/renesas/ebisu/Makefile b/board/renesas/ebisu/Makefile
deleted file mode 100644
index 72130b76234..00000000000
--- a/board/renesas/ebisu/Makefile
+++ /dev/null
@@ -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
diff --git a/board/renesas/falcon/Makefile b/board/renesas/falcon/Makefile
deleted file mode 100644
index 430a842081a..00000000000
--- a/board/renesas/falcon/Makefile
+++ /dev/null
@@ -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
diff --git a/board/renesas/grayhawk/Makefile b/board/renesas/grayhawk/Makefile
deleted file mode 100644
index a70bd3739f1..00000000000
--- a/board/renesas/grayhawk/Makefile
+++ /dev/null
@@ -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
diff --git a/board/renesas/salvator-x/Makefile b/board/renesas/salvator-x/Makefile
index fe53366829c..538bbdddf76 100644
--- a/board/renesas/salvator-x/Makefile
+++ b/board/renesas/salvator-x/Makefile
@@ -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
diff --git a/board/renesas/spider/Makefile b/board/renesas/spider/Makefile
deleted file mode 100644
index e0f403d5fcc..00000000000
--- a/board/renesas/spider/Makefile
+++ /dev/null
@@ -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
diff --git a/board/renesas/ulcb/Makefile b/board/renesas/ulcb/Makefile
index 6b2aa8c29f6..4f2dd1ca211 100644
--- a/board/renesas/ulcb/Makefile
+++ b/board/renesas/ulcb/Makefile
@@ -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
diff --git a/board/renesas/v3hsk/Makefile b/board/renesas/v3hsk/Makefile
index 936047cb3d5..e6db77468e6 100644
--- a/board/renesas/v3hsk/Makefile
+++ b/board/renesas/v3hsk/Makefile
@@ -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
diff --git a/board/renesas/v3msk/Makefile b/board/renesas/v3msk/Makefile
index 21eaddb6c28..211b8a32489 100644
--- a/board/renesas/v3msk/Makefile
+++ b/board/renesas/v3msk/Makefile
@@ -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
diff --git a/board/renesas/whitehawk/Makefile b/board/renesas/whitehawk/Makefile
deleted file mode 100644
index f10eb82d221..00000000000
--- a/board/renesas/whitehawk/Makefile
+++ /dev/null
@@ -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
generated by cgit v1.2.3 (git 2.0.4) at 2025-07-21 12:31:22 +0000