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 | |
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')
-rw-r--r-- | arch/arm/boot/Makefile | 6 | ||||
-rw-r--r-- | arch/microblaze/boot/Makefile | 2 | ||||
-rw-r--r-- | arch/openrisc/boot/Makefile | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/Makefile | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 5df26a9976a2..fc871e719aae 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile | |||
@@ -59,9 +59,11 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE | |||
59 | 59 | ||
60 | endif | 60 | endif |
61 | 61 | ||
62 | targets += $(dtb-y) | ||
63 | |||
62 | # Rule to build device tree blobs | 64 | # Rule to build device tree blobs |
63 | $(obj)/%.dtb: $(src)/dts/%.dts | 65 | $(obj)/%.dtb: $(src)/dts/%.dts FORCE |
64 | $(call cmd,dtc) | 66 | $(call if_changed_dep,dtc) |
65 | 67 | ||
66 | $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) | 68 | $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) |
67 | 69 | ||
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index 4c4e58ef0cb6..0c796cf81586 100644 --- a/arch/microblaze/boot/Makefile +++ b/arch/microblaze/boot/Makefile | |||
@@ -53,6 +53,6 @@ $(obj)/simpleImage.%: vmlinux FORCE | |||
53 | DTC_FLAGS := -p 1024 | 53 | DTC_FLAGS := -p 1024 |
54 | 54 | ||
55 | $(obj)/%.dtb: $(src)/dts/%.dts FORCE | 55 | $(obj)/%.dtb: $(src)/dts/%.dts FORCE |
56 | $(call cmd,dtc) | 56 | $(call if_changed_dep,dtc) |
57 | 57 | ||
58 | clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub | 58 | clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub |
diff --git a/arch/openrisc/boot/Makefile b/arch/openrisc/boot/Makefile index 98ca185097a5..09958358601a 100644 --- a/arch/openrisc/boot/Makefile +++ b/arch/openrisc/boot/Makefile | |||
@@ -11,5 +11,5 @@ clean-files := *.dtb.S | |||
11 | 11 | ||
12 | #DTC_FLAGS ?= -p 1024 | 12 | #DTC_FLAGS ?= -p 1024 |
13 | 13 | ||
14 | $(obj)/%.dtb: $(src)/dts/%.dts | 14 | $(obj)/%.dtb: $(src)/dts/%.dts FORCE |
15 | $(call cmd,dtc) | 15 | $(call if_changed_dep,dtc) |
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)) |