-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
Showing
5 changed files
with
23 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" |
This file was deleted.
Oops, something went wrong.