Skip to content

Commit

Permalink
c6x: use new common dtc rule
Browse files Browse the repository at this point in the history
The current rules have the .dtb files build in a different directory
from the .dts files. This patch changes c6x to use the generic dtb
rule which builds .dtb files in the same directory as the source .dts.

This requires moving parts of arch/c6x/boot/Makefile into newly created
arch/c6x/boot/dts/Makefile, and updating arch/c6x/Makefile to call the
new Makefile. linked_dtb.S is also moved into boot/dts/ since it's used
by rules that were moved.

Acked-by: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: linux-c6x-dev@linux-c6x.org
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
  • Loading branch information
Stephen Warren authored and Rob Herring committed Dec 3, 2012
1 parent 19fbd6b commit 1020e29
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion arch/c6x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ DTB:=$(subst dtbImage.,,$(filter dtbImage.%, $(MAKECMDGOALS)))
export DTB

ifneq ($(DTB),)
core-y += $(boot)/
core-y += $(boot)/dts/
endif

# With make 3.82 we cannot mix normal and wildcard targets
Expand Down
20 changes: 0 additions & 20 deletions arch/c6x/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,5 @@ OBJCOPYFLAGS_vmlinux.bin := -O binary
$(obj)/vmlinux.bin: vmlinux FORCE
$(call if_changed,objcopy)

DTC_FLAGS ?= -p 1024

ifneq ($(DTB),)
obj-y += linked_dtb.o
endif

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

quiet_cmd_cp = CP $< $@$2
cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)

# Generate builtin.dtb from $(DTB).dtb
$(obj)/builtin.dtb: $(obj)/$(DTB).dtb
$(call if_changed,cp)

$(obj)/linked_dtb.o: $(obj)/builtin.dtb

$(obj)/dtbImage.%: vmlinux
$(call if_changed,objcopy)

clean-files := $(obj)/*.dtb
20 changes: 20 additions & 0 deletions arch/c6x/boot/dts/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# Makefile for device trees
#

DTC_FLAGS ?= -p 1024

ifneq ($(DTB),)
obj-y += linked_dtb.o
endif

quiet_cmd_cp = CP $< $@$2
cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)

# Generate builtin.dtb from $(DTB).dtb
$(obj)/builtin.dtb: $(obj)/$(DTB).dtb
$(call if_changed,cp)

$(obj)/linked_dtb.o: $(obj)/builtin.dtb

clean-files := *.dtb
2 changes: 2 additions & 0 deletions arch/c6x/boot/dts/linked_dtb.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.section __fdt_blob,"a"
.incbin "arch/c6x/boot/dts/builtin.dtb"
2 changes: 0 additions & 2 deletions arch/c6x/boot/linked_dtb.S

This file was deleted.

0 comments on commit 1020e29

Please sign in to comment.