csky: dtb Kbuild fixup patches for linux-4.20-rc1
These patches are complementary to "C-SKY(csky) Port for Linux 4.20" and fixup dtb Kbuild to follow the new Devicetree dtb build rules. Link: https://lore.kernel.org/lkml/CABGGisxiWaQn9qDqpfxEWcckkGJfMzFvSPGvuhQK7oB404-6DQ@mail.gmail.com/ Signed-off-by: Guo Ren <ren_guo@c-sky.com> -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEE2KAv+isbWR/viAKHAXH1GYaIxXsFAlvadMUSHHJlbl9ndW9A Yy1za3kuY29tAAoJEAFx9RmGiMV7fN4P/ieygi8RlzFF5PEggQEt1PdvGnte2Kx/ UUqlX7ZrY/ZY8p/XaG8p0YlWx236YcZoQtTJT4ThVuAFyywuIjR96kWlKwVjeKC2 /lfXvQrJRSjzQAQU2zRe+KMEvsEw0qEO9WWqV8pORt+t1ZjE59mFov2iK+mcS22R T12Djp7V9RYr33KFcu8BQ8g4524t9x3MSGVz+AB/D+cni8XSS3dkg5QlTWo+LGfS pHAISI3t1AftXkQ3HRpDKFs9Equ0CX3wm129j6awWHbYBpXsdwUW81fr+KMNgdd/ s59wcdRInksww5ZaAvtgfxYJeTTyu488KMEMhagDNn3n0El61ui0vncmvPebnmjB FQb4v6AvH69V2aN3/xAKuov4EfELoFUc/E0z3GJk//58d6kshMdyI++QB2CFZ8IS TqHSkkEKCpThTyJavGuS0Jvkj7vpneW5iDFQwWN0RqIub7PnC6Aa0uSw+/G7Pq/5 SY2zhEJ0o6waBuQR5IEYzxvRwlU3hNuqXe7/if4kqw/LQUFTydKX7eQAcrSTLlnI /jxrXH7vaymhD9/wI58GPIsqaRObln92uaUWHpjQqKPXdnemv60dSta2LLkdY4Le MVsTc412nkFjt4Ft+uOrcJQnVsK48RTh56vBB44zxONoK9tUz0y6wgIEyebwzRSy uYaZ6t0jj7A3 =TO13 -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
5c99a8d1ed
|
@ -1,9 +1 @@
|
||||||
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
|
|
||||||
|
|
|
@ -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)'
|
||||||
|
|
|
@ -1,13 +1,3 @@
|
||||||
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
|
|
||||||
|
|
Loading…
Reference in a new issue