diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 02:00:48 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 02:00:48 -0500 |
commit | 02cee68998010c4a2cc2383c86babc2ecc737183 (patch) | |
tree | 13c6483472f672c3b2570b075ed2ad4fd4c5405e /arch/sh/Makefile | |
parent | f5ba35023697e54a24487bcd822194390a333893 (diff) | |
parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) |
Merge commit 'v2.6.32-rc6' into next
Diffstat (limited to 'arch/sh/Makefile')
-rw-r--r-- | arch/sh/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index fc51a918b31a..66e40aabc600 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile | |||
@@ -199,7 +199,7 @@ endif | |||
199 | libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y) | 199 | libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y) |
200 | libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y) | 200 | libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y) |
201 | 201 | ||
202 | BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec \ | 202 | BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec uImage.bin \ |
203 | zImage vmlinux.srec romImage | 203 | zImage vmlinux.srec romImage |
204 | PHONY += maketools $(BOOT_TARGETS) FORCE | 204 | PHONY += maketools $(BOOT_TARGETS) FORCE |
205 | 205 | ||
@@ -225,6 +225,7 @@ define archhelp | |||
225 | @echo ' vmlinux.srec - Create an ELF S-record' | 225 | @echo ' vmlinux.srec - Create an ELF S-record' |
226 | @echo '* uImage - Alias to bootable U-Boot image' | 226 | @echo '* uImage - Alias to bootable U-Boot image' |
227 | @echo ' uImage.srec - Create an S-record for U-Boot' | 227 | @echo ' uImage.srec - Create an S-record for U-Boot' |
228 | @echo ' uImage.bin - Kernel-only image for U-Boot (bin)' | ||
228 | @echo '* uImage.gz - Kernel-only image for U-Boot (gzip)' | 229 | @echo '* uImage.gz - Kernel-only image for U-Boot (gzip)' |
229 | @echo ' uImage.bz2 - Kernel-only image for U-Boot (bzip2)' | 230 | @echo ' uImage.bz2 - Kernel-only image for U-Boot (bzip2)' |
230 | @echo ' uImage.lzma - Kernel-only image for U-Boot (lzma)' | 231 | @echo ' uImage.lzma - Kernel-only image for U-Boot (lzma)' |