diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-12 23:29:19 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-12 23:29:19 -0500 |
commit | c7b16efb7d0c7fce218b2cdafa2432c5fbf57314 (patch) | |
tree | b82e0aa1c50b9d0bf358b0c2050695e2c8094748 /arch/sh/boot/compressed | |
parent | 644755e7867710a23e6243dcc69cfc071985f560 (diff) |
sh: Add support for LZO-compressed kernels.
Plugs in LZO along with the others.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boot/compressed')
-rw-r--r-- | arch/sh/boot/compressed/Makefile | 3 | ||||
-rw-r--r-- | arch/sh/boot/compressed/misc.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile index 6182eca5180a..6b95a2a48267 100644 --- a/arch/sh/boot/compressed/Makefile +++ b/arch/sh/boot/compressed/Makefile | |||
@@ -6,6 +6,7 @@ | |||
6 | 6 | ||
7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz \ | 7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz \ |
8 | vmlinux.bin.bz2 vmlinux.bin.lzma \ | 8 | vmlinux.bin.bz2 vmlinux.bin.lzma \ |
9 | vmlinux.bin.lzo \ | ||
9 | head_$(BITS).o misc.o piggy.o | 10 | head_$(BITS).o misc.o piggy.o |
10 | 11 | ||
11 | OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o | 12 | OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o |
@@ -47,6 +48,8 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE | |||
47 | $(call if_changed,bzip2) | 48 | $(call if_changed,bzip2) |
48 | $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE | 49 | $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE |
49 | $(call if_changed,lzma) | 50 | $(call if_changed,lzma) |
51 | $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE | ||
52 | $(call if_changed,lzo) | ||
50 | 53 | ||
51 | OBJCOPYFLAGS += -R .empty_zero_page | 54 | OBJCOPYFLAGS += -R .empty_zero_page |
52 | 55 | ||
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c index b51b1fc4baae..4b319e9e4f88 100644 --- a/arch/sh/boot/compressed/misc.c +++ b/arch/sh/boot/compressed/misc.c | |||
@@ -62,6 +62,10 @@ static unsigned long free_mem_end_ptr; | |||
62 | #include "../../../../lib/decompress_unlzma.c" | 62 | #include "../../../../lib/decompress_unlzma.c" |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | #ifdef CONFIG_KERNEL_LZO | ||
66 | #include "../../../../lib/decompress_unlzo.c" | ||
67 | #endif | ||
68 | |||
65 | #ifdef CONFIG_SH_STANDARD_BIOS | 69 | #ifdef CONFIG_SH_STANDARD_BIOS |
66 | size_t strlen(const char *s) | 70 | size_t strlen(const char *s) |
67 | { | 71 | { |