summaryrefslogtreecommitdiffstats
path: root/arch/sh/boot/compressed
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-13 13:29:19 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-01-13 13:29:19 +0900
commitc7b16efb7d0c7fce218b2cdafa2432c5fbf57314 (patch)
treeb82e0aa1c50b9d0bf358b0c2050695e2c8094748 /arch/sh/boot/compressed
parent644755e7867710a23e6243dcc69cfc071985f560 (diff)
downloadlinux-c7b16efb7d0c7fce218b2cdafa2432c5fbf57314.tar.gz
linux-c7b16efb7d0c7fce218b2cdafa2432c5fbf57314.tar.bz2
linux-c7b16efb7d0c7fce218b2cdafa2432c5fbf57314.zip
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/Makefile3
-rw-r--r--arch/sh/boot/compressed/misc.c4
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 @@
targets := vmlinux vmlinux.bin vmlinux.bin.gz \
vmlinux.bin.bz2 vmlinux.bin.lzma \
+ vmlinux.bin.lzo \
head_$(BITS).o misc.o piggy.o
OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o
@@ -47,6 +48,8 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
$(call if_changed,bzip2)
$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
$(call if_changed,lzma)
+$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
+ $(call if_changed,lzo)
OBJCOPYFLAGS += -R .empty_zero_page
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;
#include "../../../../lib/decompress_unlzma.c"
#endif
+#ifdef CONFIG_KERNEL_LZO
+#include "../../../../lib/decompress_unlzo.c"
+#endif
+
#ifdef CONFIG_SH_STANDARD_BIOS
size_t strlen(const char *s)
{