Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Sat, 6 Mar 2010
 07:28:33 -0700
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id o26ESXWE031231	for
 <andy.sharp@lsi.com>; Sat, 6 Mar 2010 06:28:33 -0800
Received: from psmtp.com (na3sys009amx207.postini.com [74.125.149.47])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id o26ENR0o009587	for
 <andy.sharp@lsi.com>; Sat, 6 Mar 2010 06:23:27 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx207.postini.com
 ([74.125.148.14]) with SMTP;	Sat, 06 Mar 2010 09:28:31 EST
Received: from localhost.localdomain ([127.0.0.1]:37462 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1492082Ab0CFO23 (ORCPT
        <rfc822;andy.sharp@lsi.com>); Sat, 6 Mar 2010 15:28:29 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 06 Mar 2010 15:28:12
 +0100 (CET)
Received: from www.linuxtv.org ([130.149.80.248]:33640 "EHLO www.linuxtv.org"
        rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP        id
 S1492108Ab0CFO2E (ORCPT <rfc822;linux-mips@linux-mips.org>);        Sat, 6
 Mar 2010 15:28:04 +0100
Received: from mchehab by www.linuxtv.org with local (Exim 4.69)
        (envelope-from <mchehab@linuxtv.org>)        id 1Nnuz4-0001b4-KN; Sat,
 06 Mar 2010 15:28:02 +0100
From: Patch from Wu Zhangjin <linuxtv-commits-bounces@linuxtv.org>
To: "linuxtv-commits@linuxtv.org" <linuxtv-commits@linuxtv.org>
CC: Wu Zhangjin <wuzhangjin@gmail.com>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, Sergei Shtylyov <sshtylyov@ru.mvista.com>, Ralf
 Baechle <ralf@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Sat, 6 Mar 2010 07:28:02 -0700
Subject: [git:v4l-dvb/master] MIPS: Add support of LZO-compressed kernels
Thread-Topic: [git:v4l-dvb/master] MIPS: Add support of LZO-compressed
 kernels
Thread-Index: Acq9OU0h8WOZC2+RR3iUq2vnwwCeDQ==
Message-ID: <E1Nnuz4-0001b4-KN@www.linuxtv.org>
Reply-To: "linux-media@vger.kernel.org" <linux-media@vger.kernel.org>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:89.88570/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <linuxtv-commits-bounces@linuxtv.org> [22/1] 
x-pstn-neptune: 0/0/0.00/0
mail-followup-to: linux-media@vger.kernel.org
x-list: linux-mips
x-original-sender: linuxtv-commits-bounces@linuxtv.org
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

From: Wu Zhangjin <wuzhangjin@gmail.com>

The necessary changes to the x86 Kconfig and boot/compressed to allow the
use of this new compression method.

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Patchwork: http://patchwork.linux-mips.org/patch/857/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

 arch/mips/Kconfig                      |    1 +
 arch/mips/boot/compressed/Makefile     |    2 ++
 arch/mips/boot/compressed/decompress.c |    4 ++++
 3 files changed, 7 insertions(+), 0 deletions(-)

---

http://git.linuxtv.org/v4l-dvb.git?a=3Dcommitdiff;h=3Dfe1d45e08650213ec83a7=
2d3499c3dd703243792

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
=20
 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)  =3D gz
 suffix_$(CONFIG_KERNEL_BZIP2) =3D bz2
 suffix_$(CONFIG_KERNEL_LZMA)  =3D lzma
+suffix_$(CONFIG_KERNEL_LZO)   =3D lzo
 tool_$(CONFIG_KERNEL_GZIP)    =3D gzip
 tool_$(CONFIG_KERNEL_BZIP2)   =3D bzip2
 tool_$(CONFIG_KERNEL_LZMA)    =3D lzma
+tool_$(CONFIG_KERNEL_LZO)     =3D lzo
 $(obj)/vmlinux.$(suffix_y): $(obj)/vmlinux.bin
 	$(call if_changed,$(tool_y))
=20
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compre=
ssed/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
=20
+#ifdef CONFIG_KERNEL_LZO
+#include "../../../../lib/decompress_unlzo.c"
+#endif
+
 void decompress_kernel(unsigned long boot_heap_start)
 {
 	int zimage_size;

