aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/Makefile2
-rw-r--r--arch/microblaze/boot/Makefile19
-rw-r--r--arch/microblaze/boot/dts/Makefile22
-rw-r--r--arch/microblaze/boot/dts/linked_dtb.S2
-rw-r--r--arch/microblaze/boot/linked_dtb.S3
5 files changed, 26 insertions, 22 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index b23c40eb7a52..d26fb905ee0a 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -57,7 +57,7 @@ boot := arch/microblaze/boot
57DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS))) 57DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS)))
58 58
59ifneq ($(DTB),) 59ifneq ($(DTB),)
60 core-y += $(boot)/ 60 core-y += $(boot)/dts/
61endif 61endif
62 62
63# defines filename extension depending memory management type 63# defines filename extension depending memory management type
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
diff --git a/arch/microblaze/boot/dts/Makefile b/arch/microblaze/boot/dts/Makefile
new file mode 100644
index 000000000000..c3b3a5d67b89
--- /dev/null
+++ b/arch/microblaze/boot/dts/Makefile
@@ -0,0 +1,22 @@
1#
2# arch/microblaze/boot/Makefile
3#
4
5obj-y += linked_dtb.o
6
7# Ensure system.dtb exists
8$(obj)/linked_dtb.o: $(obj)/system.dtb
9
10# Generate system.dtb from $(DTB).dtb
11ifneq ($(DTB),system)
12$(obj)/system.dtb: $(obj)/$(DTB).dtb
13 $(call if_changed,cp)
14endif
15
16quiet_cmd_cp = CP $< $@$2
17 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)
18
19# Rule to build device tree blobs
20DTC_FLAGS := -p 1024
21
22clean-files += *.dtb
diff --git a/arch/microblaze/boot/dts/linked_dtb.S b/arch/microblaze/boot/dts/linked_dtb.S
new file mode 100644
index 000000000000..23345af3721f
--- /dev/null
+++ b/arch/microblaze/boot/dts/linked_dtb.S
@@ -0,0 +1,2 @@
1.section __fdt_blob,"a"
2.incbin "arch/microblaze/boot/dts/system.dtb"
diff --git a/arch/microblaze/boot/linked_dtb.S b/arch/microblaze/boot/linked_dtb.S
deleted file mode 100644
index cb2b537aebee..000000000000
--- a/arch/microblaze/boot/linked_dtb.S
+++ /dev/null
@@ -1,3 +0,0 @@
1.section __fdt_blob,"a"
2.incbin "arch/microblaze/boot/system.dtb"
3