Commit ec72c666 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

usr/Kconfig: make initrd compression algorithm selection not expert

The kernel has support for (nearly) every compression algorithm known to
man, each to handle some particular microscopic niche.

Unfortunately all of these always get compiled in if you want to support
INITRDs, and can be only disabled when CONFIG_EXPERT is set.

I don't see why I need to set EXPERT just to properly configure the initrd
compression algorithms, and not always include every possible algorithm

Usually the initrd is just compressed with gzip anyways, at least that's
true on all distributions I use.

Remove the dependencies for initrd compression on CONFIG_EXPERT.

Make the various options just default y, which should be good enough to
not break any previous configuration.
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6adc4a22
...@@ -46,17 +46,17 @@ config INITRAMFS_ROOT_GID ...@@ -46,17 +46,17 @@ config INITRAMFS_ROOT_GID
If you are not sure, leave it set to "0". If you are not sure, leave it set to "0".
config RD_GZIP config RD_GZIP
bool "Support initial ramdisks compressed using gzip" if EXPERT bool "Support initial ramdisks compressed using gzip"
default y
depends on BLK_DEV_INITRD depends on BLK_DEV_INITRD
default y
select DECOMPRESS_GZIP select DECOMPRESS_GZIP
help help
Support loading of a gzip encoded initial ramdisk or cpio buffer. Support loading of a gzip encoded initial ramdisk or cpio buffer.
If unsure, say Y. If unsure, say Y.
config RD_BZIP2 config RD_BZIP2
bool "Support initial ramdisks compressed using bzip2" if EXPERT bool "Support initial ramdisks compressed using bzip2"
default !EXPERT default y
depends on BLK_DEV_INITRD depends on BLK_DEV_INITRD
select DECOMPRESS_BZIP2 select DECOMPRESS_BZIP2
help help
...@@ -64,8 +64,8 @@ config RD_BZIP2 ...@@ -64,8 +64,8 @@ config RD_BZIP2
If unsure, say N. If unsure, say N.
config RD_LZMA config RD_LZMA
bool "Support initial ramdisks compressed using LZMA" if EXPERT bool "Support initial ramdisks compressed using LZMA"
default !EXPERT default y
depends on BLK_DEV_INITRD depends on BLK_DEV_INITRD
select DECOMPRESS_LZMA select DECOMPRESS_LZMA
help help
...@@ -73,17 +73,17 @@ config RD_LZMA ...@@ -73,17 +73,17 @@ config RD_LZMA
If unsure, say N. If unsure, say N.
config RD_XZ config RD_XZ
bool "Support initial ramdisks compressed using XZ" if EXPERT bool "Support initial ramdisks compressed using XZ"
default !EXPERT
depends on BLK_DEV_INITRD depends on BLK_DEV_INITRD
default y
select DECOMPRESS_XZ select DECOMPRESS_XZ
help help
Support loading of a XZ encoded initial ramdisk or cpio buffer. Support loading of a XZ encoded initial ramdisk or cpio buffer.
If unsure, say N. If unsure, say N.
config RD_LZO config RD_LZO
bool "Support initial ramdisks compressed using LZO" if EXPERT bool "Support initial ramdisks compressed using LZO"
default !EXPERT default y
depends on BLK_DEV_INITRD depends on BLK_DEV_INITRD
select DECOMPRESS_LZO select DECOMPRESS_LZO
help help
...@@ -91,8 +91,8 @@ config RD_LZO ...@@ -91,8 +91,8 @@ config RD_LZO
If unsure, say N. If unsure, say N.
config RD_LZ4 config RD_LZ4
bool "Support initial ramdisks compressed using LZ4" if EXPERT bool "Support initial ramdisks compressed using LZ4"
default !EXPERT default y
depends on BLK_DEV_INITRD depends on BLK_DEV_INITRD
select DECOMPRESS_LZ4 select DECOMPRESS_LZ4
help help
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment