2021-01-17 08:10:47

by Masahiro Yamada

Subject: [PATCH] openrisc: add arch/openrisc/Kbuild

Describe the subdirectories under arch/openrisc/ in arch/openrisc/Kbuild
so you can use the standard obj-y syntax.

I removed the CONFIG_OPENRISC_BUILTIN_DTB conditional because it is
already controlled by arch/openrisc/boot/dts/Makefile.

Signed-off-by: Masahiro Yamada <[email protected]>
---

arch/openrisc/Kbuild | 3 +++
arch/openrisc/Makefile | 11 +----------
2 files changed, 4 insertions(+), 10 deletions(-)
create mode 100644 arch/openrisc/Kbuild

diff --git a/arch/openrisc/Kbuild b/arch/openrisc/Kbuild
new file mode 100644
index 000000000000..4234b4c03e72
--- /dev/null
+++ b/arch/openrisc/Kbuild
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += lib/ kernel/ mm/
+obj-y += boot/dts/
diff --git a/arch/openrisc/Makefile b/arch/openrisc/Makefile
index bf10141c7426..44e63fa35e04 100644
--- a/arch/openrisc/Makefile
+++ b/arch/openrisc/Makefile
@@ -38,14 +38,5 @@ endif

head-y := arch/openrisc/kernel/head.o

-core-y += arch/openrisc/lib/ \
- arch/openrisc/kernel/ \
- arch/openrisc/mm/
+core-y += arch/openrisc/
libs-y += $(LIBGCC)
-
-ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""'
-BUILTIN_DTB := y
-else
-BUILTIN_DTB := n
-endif
-core-$(BUILTIN_DTB) += arch/openrisc/boot/dts/
--
2.27.0

2021-01-18 12:12:41

by Stafford Horne

Subject: Re: [PATCH] openrisc: add arch/openrisc/Kbuild

On Sun, Jan 17, 2021 at 05:03:32PM +0900, Masahiro Yamada wrote:
> Describe the subdirectories under arch/openrisc/ in arch/openrisc/Kbuild
> so you can use the standard obj-y syntax.
>
> I removed the CONFIG_OPENRISC_BUILTIN_DTB conditional because it is
> already controlled by arch/openrisc/boot/dts/Makefile.
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Thank you, This looks OK to me, I have queued this for next.

There was a small conflict with the vmlinux.bin changes you reviewed earlier.
I resolved them and did a test bild and it seems to all be fine.

-Stafford