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@xxxxxxxxx> 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@xxxxxxxxx> > > Cc: Rob Herring <robh@xxxxxxxxxx> > > Cc: Arnd Bergmann <arnd@xxxxxxxx> > > --- > > 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
