diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-10-26 06:46:59 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-26 06:46:59 -0400 |
commit | a384fe55c23bdcd4b027e09bd8e993d1c90bfae9 (patch) | |
tree | 825c5a22c7cbe36b9d7dd95878cf141e89cf8d96 /arch/sh/boot | |
parent | ef01b9a06d28e37d28f6eb19e60dd78eb1f11639 (diff) | |
parent | 9e24c7e2ac269486ab7c69ce50e944698e818fac (diff) |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/boot')
-rw-r--r-- | arch/sh/boot/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile index a1316872be6f..cb8cf5572e79 100644 --- a/arch/sh/boot/Makefile +++ b/arch/sh/boot/Makefile | |||
@@ -20,11 +20,12 @@ CONFIG_BOOT_LINK_OFFSET ?= 0x00800000 | |||
20 | CONFIG_ZERO_PAGE_OFFSET ?= 0x00001000 | 20 | CONFIG_ZERO_PAGE_OFFSET ?= 0x00001000 |
21 | CONFIG_ENTRY_OFFSET ?= 0x00001000 | 21 | CONFIG_ENTRY_OFFSET ?= 0x00001000 |
22 | 22 | ||
23 | suffix-y := bin | ||
23 | suffix-$(CONFIG_KERNEL_GZIP) := gz | 24 | suffix-$(CONFIG_KERNEL_GZIP) := gz |
24 | suffix-$(CONFIG_KERNEL_BZIP2) := bz2 | 25 | suffix-$(CONFIG_KERNEL_BZIP2) := bz2 |
25 | suffix-$(CONFIG_KERNEL_LZMA) := lzma | 26 | suffix-$(CONFIG_KERNEL_LZMA) := lzma |
26 | 27 | ||
27 | targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz uImage.bz2 uImage.lzma | 28 | targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz uImage.bz2 uImage.lzma uImage.bin |
28 | extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma | 29 | extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma |
29 | subdir- := compressed romimage | 30 | subdir- := compressed romimage |
30 | 31 | ||
@@ -88,6 +89,9 @@ $(obj)/uImage.gz: $(obj)/vmlinux.bin.gz | |||
88 | $(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma | 89 | $(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma |
89 | $(call if_changed,uimage,lzma) | 90 | $(call if_changed,uimage,lzma) |
90 | 91 | ||
92 | $(obj)/uImage.bin: $(obj)/vmlinux.bin | ||
93 | $(call if_changed,uimage,none) | ||
94 | |||
91 | OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec | 95 | OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec |
92 | $(obj)/vmlinux.srec: $(obj)/compressed/vmlinux | 96 | $(obj)/vmlinux.srec: $(obj)/compressed/vmlinux |
93 | $(call if_changed,objcopy) | 97 | $(call if_changed,objcopy) |