Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e8524d authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/kbuild' into dt/next

parents 48c926cd 7e7962dd
Loading
Loading
Loading
Loading
+23 −21
Original line number Original line Diff line number Diff line
@@ -7,38 +7,40 @@
# command after changing this file, to see if there are
# command after changing this file, to see if there are
# any tracked files which get ignored after the change.
# any tracked files which get ignored after the change.
#
#
# Normal rules
# Normal rules (sorted alphabetically)
#
#
.*
.*
*.a
*.bin
*.bz2
*.c.[012]*.*
*.dtb
*.dtb.S
*.dwo
*.elf
*.gcno
*.gz
*.i
*.ko
*.ll
*.lst
*.lz4
*.lzma
*.lzo
*.mod.c
*.o
*.o
*.o.*
*.o.*
*.a
*.order
*.patch
*.s
*.s
*.ko
*.so
*.so
*.so.dbg
*.so.dbg
*.mod.c
*.su
*.i
*.lst
*.symtypes
*.symtypes
*.order
*.elf
*.bin
*.tar
*.tar
*.gz
*.bz2
*.lzma
*.xz
*.xz
*.lz4
*.lzo
*.patch
*.gcno
*.ll
modules.builtin
Module.symvers
Module.symvers
*.dwo
modules.builtin
*.su
*.c.[012]*.*


#
#
# Top-level generic files
# Top-level generic files
+0 −1
Original line number Original line Diff line number Diff line
@@ -1153,7 +1153,6 @@ When kbuild executes, the following steps are followed (roughly):


	Example:
	Example:
		targets += $(dtb-y)
		targets += $(dtb-y)
		clean-files += *.dtb
		DTC_FLAGS ?= -p 1024
		DTC_FLAGS ?= -p 1024


--- 6.8 Custom kbuild commands
--- 6.8 Custom kbuild commands
+1 −1
Original line number Original line Diff line number Diff line
@@ -1544,7 +1544,7 @@ clean: $(clean-dirs)
	$(call cmd,rmfiles)
	$(call cmd,rmfiles)
	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
		-o -name '*.ko.*' \
		-o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \
		-o -name '*.dwo'  \
		-o -name '*.dwo'  \
		-o -name '*.su'  \
		-o -name '*.su'  \
		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
+0 −1
Original line number Original line Diff line number Diff line
*.dtb*
uImage
uImage
+3 −5
Original line number Original line Diff line number Diff line
@@ -10,8 +10,6 @@ dtb-y := $(builtindtb-y).dtb


.SECONDARY: $(obj)/$(builtindtb-y).dtb.S
.SECONDARY: $(obj)/$(builtindtb-y).dtb.S


# for CONFIG_OF_ALL_DTBS test
dtstree	:= $(srctree)/$(src)
dtstree	:= $(srctree)/$(src)
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
dtb-	:= $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))

always := $(dtb-y)
clean-files := *.dtb  *.dtb.S
Loading