| Submitter | Wu Zhangjin |
|---|---|
| Date | 2010-01-15 12:34:46 |
| Message ID | <2efc4ca08c90ad087a2e84cadee03eb09b5268ba.1263558635.git.wuzhangjin@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/857/ |
| State | Accepted |
| Delegated to: | Ralf Baechle |
| Headers | show |
Comments
On Fri, Jan 15, 2010 at 08:34:46PM +0800, Wu Zhangjin wrote: > (Changes from v0: 'align "lzo" with the rest of the suffixes/tool names' as > Sergei suggested.) > > The commit "lib: add support for LZO-compressed kernels" has been merged > into linus' 2.6.33-rc4 tree, so, It is time to add the support for MIPS. > > NOTE: to enable this support, the lzop application is needed. > > Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com> Thanks, applied. Ralf
Patch
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 9541171..8b5d174 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1311,6 +1311,7 @@ config SYS_SUPPORTS_ZBOOT select HAVE_KERNEL_GZIP select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_LZMA + select HAVE_KERNEL_LZO config SYS_SUPPORTS_ZBOOT_UART16550 bool diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index 671d344..bdcfd49 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile @@ -41,9 +41,11 @@ $(obj)/vmlinux.bin: $(KBUILD_IMAGE) suffix_$(CONFIG_KERNEL_GZIP) = gz suffix_$(CONFIG_KERNEL_BZIP2) = bz2 suffix_$(CONFIG_KERNEL_LZMA) = lzma +suffix_$(CONFIG_KERNEL_LZO) = lzo tool_$(CONFIG_KERNEL_GZIP) = gzip tool_$(CONFIG_KERNEL_BZIP2) = bzip2 tool_$(CONFIG_KERNEL_LZMA) = lzma +tool_$(CONFIG_KERNEL_LZO) = lzo $(obj)/vmlinux.$(suffix_y): $(obj)/vmlinux.bin $(call if_changed,$(tool_y)) diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c index e48fd72..55d02b3 100644 --- a/arch/mips/boot/compressed/decompress.c +++ b/arch/mips/boot/compressed/decompress.c @@ -77,6 +77,10 @@ void *memset(void *s, int c, size_t n) #include "../../../../lib/decompress_unlzma.c" #endif +#ifdef CONFIG_KERNEL_LZO +#include "../../../../lib/decompress_unlzo.c" +#endif + void decompress_kernel(unsigned long boot_heap_start) { int zimage_size;
(Changes from v0: 'align "lzo" with the rest of the suffixes/tool names' as Sergei suggested.) The commit "lib: add support for LZO-compressed kernels" has been merged into linus' 2.6.33-rc4 tree, so, It is time to add the support for MIPS. NOTE: to enable this support, the lzop application is needed. Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com> --- arch/mips/Kconfig | 1 + arch/mips/boot/compressed/Makefile | 2 ++ arch/mips/boot/compressed/decompress.c | 4 ++++ 3 files changed, 7 insertions(+), 0 deletions(-)