Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285813
b: refs/heads/master
c: 7c43185
h: refs/heads/master
i:
  285811: 067331b
v: v3
  • Loading branch information
Stephen Warren authored and Michal Marek committed Jan 14, 2012
1 parent 952be07 commit 594eb58
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 136ec2049fea65aed0446d04ab7cfff2ae3070f1
refs/heads/master: 7c43185138cf523b0810ffd2c9e18e2ecb356730
6 changes: 4 additions & 2 deletions trunk/arch/arm/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/microblaze/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions trunk/arch/openrisc/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,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))
Expand Down
2 changes: 1 addition & 1 deletion trunk/scripts/Makefile.lib
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb
$(call cmd,dt_S_dtb)

quiet_cmd_dtc = DTC $@
cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $<
cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $<

# Bzip2
# ---------------------------------------------------------------------------
Expand Down

0 comments on commit 594eb58

Please sign in to comment.