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

Commit c63dbbd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Kbuild: Use dtc's -d (dependency) option
  dtc: Implement -d option to write out a dependency file
  kbuild: Fix comment in Makefile.lib
  scripts/genksyms: clean lex/yacc generated files
  kbuild: Correctly deal with make options which contain an "s"
parents 53999bf3 7c431851

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ endif 
# If the user is running make -s (silent mode), suppress echoing of

# commands



ifneq ($(findstring s,$(MAKEFLAGS)),)

ifneq ($(filter s% -s%,$(MAKEFLAGS)),)

  quiet=silent_

endif

arch/arm/boot/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -59,9 +59,11 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE 


endif



targets += $(dtb-y)



# Rule to build device tree blobs

$(obj)/%.dtb: $(src)/dts/%.dts

	$(call cmd,dtc)

$(obj)/%.dtb: $(src)/dts/%.dts FORCE

	$(call if_changed_dep,dtc)



$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))

arch/microblaze/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -53,6 +53,6 @@ $(obj)/simpleImage.%: vmlinux FORCE 
DTC_FLAGS := -p 1024



$(obj)/%.dtb: $(src)/dts/%.dts FORCE

	$(call cmd,dtc)

	$(call if_changed_dep,dtc)



clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub

arch/openrisc/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ clean-files := *.dtb.S 


#DTC_FLAGS ?= -p 1024



$(obj)/%.dtb: $(src)/dts/%.dts

	$(call cmd,dtc)
 
$(obj)/%.dtb: $(src)/dts/%.dts FORCE

	$(call if_changed_dep,dtc)

arch/powerpc/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -345,8 +345,8 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) 
	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)



# Rule to build device tree blobs

$(obj)/%.dtb: $(src)/dts/%.dts

	$(call cmd,dtc)

$(obj)/%.dtb: $(src)/dts/%.dts FORCE

	$(call if_changed_dep,dtc)



# If there isn't a platform selected then just strip the vmlinux.

ifeq (,$(image-y))