diff options
| author |   Grant Likely <grant.likely@secretlab.ca> | 2012-12-04 16:15:52 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-04 16:15:52 +0000 |
| commit | f2dcd0f8287967bb8b59f3feb775638f767f8e82 (patch) | |
| tree | 4fe387cc30d991ba82b785b25aba3104457ef418 /arch/microblaze/boot/Makefile | |
| parent | Fix build when CONFIG_W1_MASTER_GPIO=m b exporting "allnodes" (diff) | |
| parent | microblaze: use new common dtc rule (diff) | |
| download | linux-dev-f2dcd0f8287967bb8b59f3feb775638f767f8e82.tar.xz linux-dev-f2dcd0f8287967bb8b59f3feb775638f767f8e82.zip | |
Merge remote-tracking branch 'robherring/for-next' into devicetree/next
Diffstat (limited to 'arch/microblaze/boot/Makefile')
| -rw-r--r-- | arch/microblaze/boot/Makefile | 19 |
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 @@ # arch/microblaze/boot/Makefile # -obj-y += linked_dtb.o - targets := linux.bin linux.bin.gz simpleImage.% OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary -# Ensure system.dtb exists -$(obj)/linked_dtb.o: $(obj)/system.dtb - -# Generate system.dtb from $(DTB).dtb -ifneq ($(DTB),system) -$(obj)/system.dtb: $(obj)/$(DTB).dtb - $(call if_changed,cp) -endif - $(obj)/linux.bin: vmlinux FORCE $(call if_changed,objcopy) $(call if_changed,uimage) @@ -45,10 +34,4 @@ $(obj)/simpleImage.%: vmlinux FORCE @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' -# Rule to build device tree blobs -DTC_FLAGS := -p 1024 - -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) - -clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub +clean-files += simpleImage.*.unstrip linux.bin.ub |