* [PATCH] csky: remove Devicetree dtb Kbuild rules
@ 2018-10-30 8:51 Guo Ren
2018-10-30 12:30 ` Rob Herring
0 siblings, 1 reply; 3+ messages in thread
From: Guo Ren @ 2018-10-30 8:51 UTC (permalink / raw)
To: robh, arnd; +Cc: linux-arch, devicetree, Guo Ren
This modification is based on commit 37c8a5fafa3b to remove the dtb
Kbuild rules in arch/csky and use common dtb build rules. Also 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 | 13 +------------
arch/csky/boot/dts/Makefile | 7 -------
3 files changed, 2 insertions(+), 28 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..c639fc1 100644
--- a/arch/csky/Makefile
+++ b/arch/csky/Makefile
@@ -65,26 +65,15 @@ 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
-
-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)'
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] 3+ messages in thread
* Re: [PATCH] csky: remove Devicetree dtb Kbuild rules
2018-10-30 8:51 [PATCH] csky: remove Devicetree dtb Kbuild rules Guo Ren
@ 2018-10-30 12:30 ` Rob Herring
2018-10-30 17:57 ` Guo Ren
0 siblings, 1 reply; 3+ messages in thread
From: Rob Herring @ 2018-10-30 12:30 UTC (permalink / raw)
To: Guo Ren
Cc: Arnd Bergmann, open list:GENERIC INCLUDE/ASM HEADER FILES,
devicetree
On Tue, Oct 30, 2018 at 3:51 AM Guo Ren <ren_guo@c-sky.com> wrote:
>
> This modification is based on commit 37c8a5fafa3b to remove the dtb
> Kbuild rules in arch/csky and use common dtb build rules. Also 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 | 13 +------------
> arch/csky/boot/dts/Makefile | 7 -------
> 3 files changed, 2 insertions(+), 28 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..c639fc1 100644
> --- a/arch/csky/Makefile
> +++ b/arch/csky/Makefile
> @@ -65,26 +65,15 @@ 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
>
> -
> -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)'
> 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
These 2 lines can also be removed.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] csky: remove Devicetree dtb Kbuild rules
2018-10-30 12:30 ` Rob Herring
@ 2018-10-30 17:57 ` Guo Ren
0 siblings, 0 replies; 3+ messages in thread
From: Guo Ren @ 2018-10-30 17:57 UTC (permalink / raw)
To: Rob Herring
Cc: Arnd Bergmann, open list:GENERIC INCLUDE/ASM HEADER FILES,
devicetree
On Tue, Oct 30, 2018 at 07:30:43AM -0500, Rob Herring wrote:
> On Tue, Oct 30, 2018 at 3:51 AM Guo Ren <ren_guo@c-sky.com> wrote:
> >
> > This modification is based on commit 37c8a5fafa3b to remove the dtb
> > Kbuild rules in arch/csky and use common dtb build rules. Also 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 | 13 +------------
> > arch/csky/boot/dts/Makefile | 7 -------
> > 3 files changed, 2 insertions(+), 28 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..c639fc1 100644
> > --- a/arch/csky/Makefile
> > +++ b/arch/csky/Makefile
> > @@ -65,26 +65,15 @@ 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
> >
> > -
> > -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)'
> > 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
>
> These 2 lines can also be removed.
Ok, give me a ack for PATCH V3 of the patchset.
Best Regards
Guo Ren
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-31 2:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-30 8:51 [PATCH] csky: remove Devicetree dtb Kbuild rules Guo Ren
2018-10-30 12:30 ` Rob Herring
2018-10-30 17:57 ` Guo Ren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).