From 262640cb9e8c744994d0e9cb280a34a76f3a54ed Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 2 May 2010 19:31:05 +0000 Subject: [PATCH] add lzma tuning options, patch from Bernhard Loos SVN-Revision: 21311 --- .../011-tune_lzma_options.patch | 26 +++++++++++++++++++ .../patches-2.6.30/011-use_host_lzma.patch | 8 ------ .../011-tune_lzma_options.patch | 26 +++++++++++++++++++ 3 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 target/linux/rdc/patches-2.6.30/011-tune_lzma_options.patch delete mode 100644 target/linux/rdc/patches-2.6.30/011-use_host_lzma.patch create mode 100644 target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch diff --git a/target/linux/rdc/patches-2.6.30/011-tune_lzma_options.patch b/target/linux/rdc/patches-2.6.30/011-tune_lzma_options.patch new file mode 100644 index 0000000000..0b236df4aa --- /dev/null +++ b/target/linux/rdc/patches-2.6.30/011-tune_lzma_options.patch @@ -0,0 +1,26 @@ +Index: linux-2.6.32.9/scripts/Makefile.lib +=================================================================== +--- linux-2.6.32.9.orig/scripts/Makefile.lib 2010-04-13 07:55:06.543296524 +0200 ++++ linux-2.6.32.9/scripts/Makefile.lib 2010-04-13 07:55:06.814268461 +0200 +@@ -228,7 +228,7 @@ + + quiet_cmd_lzma = LZMA $@ + cmd_lzma = (cat $(filter-out FORCE,$^) | \ +- lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ ++ lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ + (rm -f $@ ; false) + + quiet_cmd_lzo = LZO $@ +Index: linux-2.6.32.9/arch/x86/include/asm/boot.h +=================================================================== +--- linux-2.6.32.9.orig/arch/x86/include/asm/boot.h 2010-02-23 16:38:51.000000000 +0100 ++++ linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-04-13 08:00:14.474369306 +0200 +@@ -28,7 +28,7 @@ + #error "Invalid value for CONFIG_PHYSICAL_ALIGN" + #endif + +-#ifdef CONFIG_KERNEL_BZIP2 ++#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA) + #define BOOT_HEAP_SIZE 0x400000 + #else /* !CONFIG_KERNEL_BZIP2 */ + diff --git a/target/linux/rdc/patches-2.6.30/011-use_host_lzma.patch b/target/linux/rdc/patches-2.6.30/011-use_host_lzma.patch deleted file mode 100644 index 0cb47349ad..0000000000 --- a/target/linux/rdc/patches-2.6.30/011-use_host_lzma.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/scripts/Makefile.lib -+++ b/scripts/Makefile.lib -@@ -204,4 +204,4 @@ cmd_bzip2 = (bzip2 -9 < $< && $(size_app - # --------------------------------------------------------------------------- - - quiet_cmd_lzma = LZMA $@ --cmd_lzma = lzma e $< $@ -lc1 -lp2 -pb2 -eos -+cmd_lzma = (/usr/bin/lzma -9 -c $< ; $(size_append) $<) >$@ || (rm -f $@ ; false) diff --git a/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch b/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch new file mode 100644 index 0000000000..0b236df4aa --- /dev/null +++ b/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch @@ -0,0 +1,26 @@ +Index: linux-2.6.32.9/scripts/Makefile.lib +=================================================================== +--- linux-2.6.32.9.orig/scripts/Makefile.lib 2010-04-13 07:55:06.543296524 +0200 ++++ linux-2.6.32.9/scripts/Makefile.lib 2010-04-13 07:55:06.814268461 +0200 +@@ -228,7 +228,7 @@ + + quiet_cmd_lzma = LZMA $@ + cmd_lzma = (cat $(filter-out FORCE,$^) | \ +- lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ ++ lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ + (rm -f $@ ; false) + + quiet_cmd_lzo = LZO $@ +Index: linux-2.6.32.9/arch/x86/include/asm/boot.h +=================================================================== +--- linux-2.6.32.9.orig/arch/x86/include/asm/boot.h 2010-02-23 16:38:51.000000000 +0100 ++++ linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-04-13 08:00:14.474369306 +0200 +@@ -28,7 +28,7 @@ + #error "Invalid value for CONFIG_PHYSICAL_ALIGN" + #endif + +-#ifdef CONFIG_KERNEL_BZIP2 ++#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA) + #define BOOT_HEAP_SIZE 0x400000 + #else /* !CONFIG_KERNEL_BZIP2 */ + -- 2.30.2