aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/boot/Makefile
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-11-27 18:29:15 -0500
committerRob Herring <rob.herring@calxeda.com>2012-12-03 18:17:50 -0500
commit300db34a7256c94dbb7676f1e87101a3bb13cdd9 (patch)
tree4caad7b25e8d8c918dba3a3abddfb53a4f9f82ae /arch/microblaze/boot/Makefile
parent1020e29cdab6bed8521a5a1a1b6f6513c393bc85 (diff)
microblaze: use new common dtc rule
The current rules have the .dtb files build in a different directory from the .dts files. This patch changes microblaze to use the generic dtb rule which builds .dtb files in the same directory as the source .dts. This requires moving parts of arch/microblaze/boot/Makefile into newly created arch/microblaze/boot/dts/Makefile, and updating arch/microblaze/Makefile to call the new Makefile. linked_dtb.S is also moved into boot/dts/ since it's used by rules that were moved. Cc: Michal Simek <monstr@monstr.eu> Cc: microblaze-uclinux@itee.uq.edu.au Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch/microblaze/boot/Makefile')
-rw-r--r--arch/microblaze/boot/Makefile19
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
index fa83ea497db7..80fe54fb7ca3 100644
--- a/arch/microblaze/boot/Makefile
+++ b/arch/microblaze/boot/Makefile
@@ -2,21 +2,10 @@
2# arch/microblaze/boot/Makefile 2# arch/microblaze/boot/Makefile
3# 3#
4 4
5obj-y += linked_dtb.o
6
7targets := linux.bin linux.bin.gz simpleImage.% 5targets := linux.bin linux.bin.gz simpleImage.%
8 6
9OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary 7OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary
10 8
11# Ensure system.dtb exists
12$(obj)/linked_dtb.o: $(obj)/system.dtb
13
14# Generate system.dtb from $(DTB).dtb
15ifneq ($(DTB),system)
16$(obj)/system.dtb: $(obj)/$(DTB).dtb
17 $(call if_changed,cp)
18endif
19
20$(obj)/linux.bin: vmlinux FORCE 9$(obj)/linux.bin: vmlinux FORCE
21 $(call if_changed,objcopy) 10 $(call if_changed,objcopy)
22 $(call if_changed,uimage) 11 $(call if_changed,uimage)
@@ -45,10 +34,4 @@ $(obj)/simpleImage.%: vmlinux FORCE
45 @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' 34 @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
46 35
47 36
48# Rule to build device tree blobs 37clean-files += simpleImage.*.unstrip linux.bin.ub
49DTC_FLAGS := -p 1024
50
51$(obj)/%.dtb: $(src)/dts/%.dts FORCE
52 $(call if_changed_dep,dtc)
53
54clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub