Commit 5c99a8d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'csky-for-linus-4.20-fixup-dtb' of https://github.com/c-sky/csky-linux 

Pull csky dtb fixups from Guo Ren:
 "These fix the csky dtb Kbuild to follow the new Devicetree dtb build
  rules"

* tag 'csky-for-linus-4.20-fixup-dtb' of https://github.com/c-sky/csky-linux:
  csky: use common dtb build rules
  csky: remove builtin-dtb Kbuild
parents eb7046e9 e8d0c9a7

arch/csky/Kconfig.debug

+1 −9
Original line number Original line Diff line number Diff line 
menu "C-SKY Debug Options"

# dummy file, do not delete
 
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

arch/csky/Makefile

+1 −12
Original line number Original line Diff line number Diff line
@@ -65,26 +65,15 @@ libs-y += arch/csky/lib/ \ 
	$(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)

	$(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)





boot := arch/csky/boot

boot := arch/csky/boot

ifneq '$(CONFIG_CSKY_BUILTIN_DTB)' '""'

core-y += $(boot)/dts/

core-y += $(boot)/dts/

endif





all: zImage

all: zImage







zImage Image uImage: vmlinux

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

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@





archclean:

archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=$(boot)/dts

	rm -rf arch/csky/include/generated





define archhelp

define archhelp

  echo  '* zImage       - Compressed kernel image (arch/$(ARCH)/boot/zImage)'

  echo  '* zImage       - Compressed kernel image (arch/$(ARCH)/boot/zImage)'

arch/csky/boot/dts/Makefile

+0 −10
Original line number Original line Diff line number Diff line 
dtstree	:= $(srctree)/$(src)

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))
 
dtb-y := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
 
endif



always += $(dtb-y)

clean-files += *.dtb *.dtb.S

CRA Git | Maintained and supported by SUSTech CRA and CCSE