diff options
| author | Tejun Heo <tj@kernel.org> | 2010-04-04 22:37:28 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-04-04 22:37:28 -0400 |
| commit | 336f5899d287f06d8329e208fc14ce50f7ec9698 (patch) | |
| tree | 9b762d450d5eb248a6ff8317badb7e223d93ed58 /arch/microblaze/boot | |
| parent | a4ab2773205e8b94c18625455f85e3b6bb9d7ad6 (diff) | |
| parent | db217dece3003df0841bacf9556b5c06aa097dae (diff) | |
Merge branch 'master' into export-slabh
Diffstat (limited to 'arch/microblaze/boot')
| -rw-r--r-- | arch/microblaze/boot/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index 902cf9846c3c..57f50c2371c6 100644 --- a/arch/microblaze/boot/Makefile +++ b/arch/microblaze/boot/Makefile | |||
| @@ -23,8 +23,6 @@ $(obj)/system.dtb: $(obj)/$(DTB).dtb | |||
| 23 | endif | 23 | endif |
| 24 | 24 | ||
| 25 | $(obj)/linux.bin: vmlinux FORCE | 25 | $(obj)/linux.bin: vmlinux FORCE |
| 26 | [ -n $(CONFIG_INITRAMFS_SOURCE) ] && [ ! -e $(CONFIG_INITRAMFS_SOURCE) ] && \ | ||
| 27 | touch $(CONFIG_INITRAMFS_SOURCE) || echo "No CPIO image" | ||
| 28 | $(call if_changed,objcopy) | 26 | $(call if_changed,objcopy) |
| 29 | $(call if_changed,uimage) | 27 | $(call if_changed,uimage) |
| 30 | @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' | 28 | @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' |
| @@ -62,6 +60,4 @@ quiet_cmd_dtc = DTC $@ | |||
| 62 | $(obj)/%.dtb: $(dtstree)/%.dts FORCE | 60 | $(obj)/%.dtb: $(dtstree)/%.dts FORCE |
| 63 | $(call if_changed,dtc) | 61 | $(call if_changed,dtc) |
| 64 | 62 | ||
| 65 | clean-kernel += linux.bin linux.bin.gz simpleImage.* | 63 | clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub |
| 66 | |||
| 67 | clean-files += *.dtb simpleImage.*.unstrip | ||