summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorChristian Ruppert2013-11-13 00:11:43 +0100
committerLinus Torvalds2013-11-13 04:09:35 +0100
commit69f0554ec261fd686ac7fa1c598cc9eb27b83a80 (patch)
tree4d3bec9af1f69197f152c08beb6ead75348914cf /init
parentdrivers: w1: make w1_slave::flags long to avoid memory corruption (diff)
downloadkernel-qcow2-linux-69f0554ec261fd686ac7fa1c598cc9eb27b83a80.tar.gz
kernel-qcow2-linux-69f0554ec261fd686ac7fa1c598cc9eb27b83a80.tar.xz
kernel-qcow2-linux-69f0554ec261fd686ac7fa1c598cc9eb27b83a80.zip
init/Kconfig: add option to disable kernel compression
Some ARC users say they can boot faster with without kernel compression. This probably depends on things like the FLASH chip they use etc. Until now, kernel compression can only be disabled by removing "select HAVE_<compression>" lines from the architecture Kconfig. So add the Kconfig logic to permit disabling of kernel compression. Signed-off-by: Christian Ruppert <christian.ruppert@abilis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig8
1 files changed, 7 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index bc8911fab28e..5496f307988e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -118,7 +118,6 @@ config HAVE_KERNEL_LZ4
choice
prompt "Kernel compression mode"
default KERNEL_GZIP
- depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO || HAVE_KERNEL_LZ4
help
The linux kernel is a kind of self-extracting executable.
Several compression algorithms are available, which differ
@@ -137,6 +136,13 @@ choice
If in doubt, select 'gzip'
+config KERNEL_UNCOMPRESSED
+ bool "No compression"
+ help
+ No compression at all. The kernel is huge but the compression and
+ decompression times are zero.
+ This is usually not what you want.
+
config KERNEL_GZIP
bool "Gzip"
depends on HAVE_KERNEL_GZIP