diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 17:34:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 17:34:54 -0500 |
commit | c63dbbd5268c397f051e0e0f665799ef64a1f3a4 (patch) | |
tree | 3d832ca143858fd601869a1e2dbe553bd513d854 /arch/powerpc | |
parent | 53999bf34d55981328f8ba9def558d3e104d6e36 (diff) | |
parent | 7c43185138cf523b0810ffd2c9e18e2ecb356730 (diff) |
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"
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/boot/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 15986e70799c..8844a17ce8ed 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -345,8 +345,8 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) | |||
345 | $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb) | 345 | $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb) |
346 | 346 | ||
347 | # Rule to build device tree blobs | 347 | # Rule to build device tree blobs |
348 | $(obj)/%.dtb: $(src)/dts/%.dts | 348 | $(obj)/%.dtb: $(src)/dts/%.dts FORCE |
349 | $(call cmd,dtc) | 349 | $(call if_changed_dep,dtc) |
350 | 350 | ||
351 | # If there isn't a platform selected then just strip the vmlinux. | 351 | # If there isn't a platform selected then just strip the vmlinux. |
352 | ifeq (,$(image-y)) | 352 | ifeq (,$(image-y)) |