* [PATCH V2 1/2] csky: remove builtin-dtb Kbuild
@ 2018-10-30 11:59 Guo Ren
2018-10-30 11:59 ` [PATCH V2 2/2] csky: use common dtb build rules Guo Ren
2018-10-30 13:35 ` [PATCH V2 1/2] csky: remove builtin-dtb Kbuild Arnd Bergmann
0 siblings, 2 replies; 4+ messages in thread
From: Guo Ren @ 2018-10-30 11:59 UTC (permalink / raw)
To: robh, arnd; +Cc: linux-arch, devicetree, Guo Ren
Remove the builtin-dtb implementation in arch/csky.
Signed-off-by: Guo Ren <ren_guo@c-sky.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
---
arch/csky/Kconfig.debug | 10 +---------
arch/csky/Makefile | 2 --
arch/csky/boot/dts/Makefile | 7 -------
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/arch/csky/Kconfig.debug b/arch/csky/Kconfig.debug
index 48cf6ff..22a162cd 100644
--- a/arch/csky/Kconfig.debug
+++ b/arch/csky/Kconfig.debug
@@ -1,9 +1 @@
-menu "C-SKY Debug Options"
-config CSKY_BUILTIN_DTB
- string "Use kernel builtin dtb"
- help
- User could define the dtb instead of the one which is passed from
- bootloader.
- Sometimes for debug, we want to use a built-in dtb and then we needn't
- modify bootloader at all.
-endmenu
+# dummy file, do not delete
diff --git a/arch/csky/Makefile b/arch/csky/Makefile
index 67a4ae1..91f7222 100644
--- a/arch/csky/Makefile
+++ b/arch/csky/Makefile
@@ -65,9 +65,7 @@ libs-y += arch/csky/lib/ \
$(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)
boot := arch/csky/boot
-ifneq '$(CONFIG_CSKY_BUILTIN_DTB)' '""'
core-y += $(boot)/dts/
-endif
all: zImage
diff --git a/arch/csky/boot/dts/Makefile b/arch/csky/boot/dts/Makefile
index 305e81a..19a7f02 100644
--- a/arch/csky/boot/dts/Makefile
+++ b/arch/csky/boot/dts/Makefile
@@ -1,13 +1,6 @@
dtstree := $(srctree)/$(src)
-ifneq '$(CONFIG_CSKY_BUILTIN_DTB)' '""'
-builtindtb-y := $(patsubst "%",%,$(CONFIG_CSKY_BUILTIN_DTB))
-dtb-y += $(builtindtb-y).dtb
-obj-y += $(builtindtb-y).dtb.o
-.SECONDARY: $(obj)/$(builtindtb-y).dtb.S
-else
dtb-y := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
-endif
always += $(dtb-y)
clean-files += *.dtb *.dtb.S
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH V2 2/2] csky: use common dtb build rules
2018-10-30 11:59 [PATCH V2 1/2] csky: remove builtin-dtb Kbuild Guo Ren
@ 2018-10-30 11:59 ` Guo Ren
2018-10-30 13:35 ` Arnd Bergmann
2018-10-30 13:35 ` [PATCH V2 1/2] csky: remove builtin-dtb Kbuild Arnd Bergmann
1 sibling, 1 reply; 4+ messages in thread
From: Guo Ren @ 2018-10-30 11:59 UTC (permalink / raw)
To: robh, arnd; +Cc: linux-arch, devicetree, Guo Ren
Remove the Kbuild rules in arch/csky and use common dtb build rules.
This modification is based on:
commit 37c8a5fafa3b ("kbuild: consolidate Devicetree dtb build rules")
Signed-off-by: Guo Ren <ren_guo@c-sky.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
---
arch/csky/Makefile | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/arch/csky/Makefile b/arch/csky/Makefile
index 91f7222..c639fc1 100644
--- a/arch/csky/Makefile
+++ b/arch/csky/Makefile
@@ -69,20 +69,11 @@ core-y += $(boot)/dts/
all: zImage
-
-dtbs: scripts
- $(Q)$(MAKE) $(build)=$(boot)/dts
-
-%.dtb %.dtb.S %.dtb.o: scripts
- $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
-
-zImage Image uImage: vmlinux dtbs
+zImage Image uImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
archclean:
$(Q)$(MAKE) $(clean)=$(boot)
- $(Q)$(MAKE) $(clean)=$(boot)/dts
- rm -rf arch/csky/include/generated
define archhelp
echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V2 1/2] csky: remove builtin-dtb Kbuild
2018-10-30 11:59 [PATCH V2 1/2] csky: remove builtin-dtb Kbuild Guo Ren
2018-10-30 11:59 ` [PATCH V2 2/2] csky: use common dtb build rules Guo Ren
@ 2018-10-30 13:35 ` Arnd Bergmann
1 sibling, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2018-10-30 13:35 UTC (permalink / raw)
To: Guo Ren; +Cc: robh, linux-arch, devicetree
On 10/30/18, Guo Ren <ren_guo@c-sky.com> wrote:
> Remove the builtin-dtb implementation in arch/csky.
>
> Signed-off-by: Guo Ren <ren_guo@c-sky.com>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V2 2/2] csky: use common dtb build rules
2018-10-30 11:59 ` [PATCH V2 2/2] csky: use common dtb build rules Guo Ren
@ 2018-10-30 13:35 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2018-10-30 13:35 UTC (permalink / raw)
To: Guo Ren; +Cc: robh, linux-arch, devicetree
On 10/30/18, Guo Ren <ren_guo@c-sky.com> wrote:
> Remove the Kbuild rules in arch/csky and use common dtb build rules.
>
> This modification is based on:
>
> commit 37c8a5fafa3b ("kbuild: consolidate Devicetree dtb build rules")
>
> Signed-off-by: Guo Ren <ren_guo@c-sky.com>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-10-30 13:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-30 11:59 [PATCH V2 1/2] csky: remove builtin-dtb Kbuild Guo Ren
2018-10-30 11:59 ` [PATCH V2 2/2] csky: use common dtb build rules Guo Ren
2018-10-30 13:35 ` Arnd Bergmann
2018-10-30 13:35 ` [PATCH V2 1/2] csky: remove builtin-dtb Kbuild Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.