aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-01-09 13:38:15 -0500
committerMichal Marek <mmarek@suse.cz>2012-01-14 18:04:35 -0500
commit7c43185138cf523b0810ffd2c9e18e2ecb356730 (patch)
tree24deed8741857d00f5575bf8febf0c6f66357af4
parent136ec2049fea65aed0446d04ab7cfff2ae3070f1 (diff)
Kbuild: Use dtc's -d (dependency) option
This hooks dtc into Kbuild's dependency system. Thus, for example, "make dtbs" will rebuild tegra-harmony.dtb if only tegra20.dtsi has changed yet tegra-harmony.dts has not. The previous lack of this feature recently caused me to have very confusing "git bisect" results. For ARM, it's obvious what to add to $(targets). I'm not familiar enough with other architectures to know what to add there. Powerpc appears to already add various .dtb files into $(targets), but the other archs may need something added to $(targets) to work. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Shawn Guo <shawn.guo@linaro.org> [mmarek: Dropped arch/c6x part to avoid merging commits from the middle of the merge window] Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--arch/arm/boot/Makefile6
-rw-r--r--arch/microblaze/boot/Makefile2
-rw-r--r--arch/openrisc/boot/Makefile4
-rw-r--r--arch/powerpc/boot/Makefile4
-rw-r--r--scripts/Makefile.lib2
5 files changed, 10 insertions, 8 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index a1edfd5a129a..816e91bce2f9 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -59,9 +59,11 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
59 59
60endif 60endif
61 61
62targets += $(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
53DTC_FLAGS := -p 1024 53DTC_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
58clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub 58clean-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 c26200b40a47..5e1f0d5b9eae 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -334,8 +334,8 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
334 $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb) 334 $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
335 335
336# Rule to build device tree blobs 336# Rule to build device tree blobs
337$(obj)/%.dtb: $(src)/dts/%.dts 337$(obj)/%.dtb: $(src)/dts/%.dts FORCE
338 $(call cmd,dtc) 338 $(call if_changed_dep,dtc)
339 339
340# If there isn't a platform selected then just strip the vmlinux. 340# If there isn't a platform selected then just strip the vmlinux.
341ifeq (,$(image-y)) 341ifeq (,$(image-y))
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 2ce2e2194f26..00c368c6e996 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -264,7 +264,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb
264 $(call cmd,dt_S_dtb) 264 $(call cmd,dt_S_dtb)
265 265
266quiet_cmd_dtc = DTC $@ 266quiet_cmd_dtc = DTC $@
267cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $< 267cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $<
268 268
269# Bzip2 269# Bzip2
270# --------------------------------------------------------------------------- 270# ---------------------------------------------------------------------------