aboutsummaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2014-12-12 19:58:03 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-13 15:42:52 -0500
commitec72c666fb345ea5f21359b7bc063710ce558e39 (patch)
tree4b889082b3ae6aa64c00da9b2d7aff5e44faa1de /usr
parent6adc4a22f20bbf3bbc754f1ec8c82be5dfb5c71a (diff)
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: Andi Kleen <ak@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'usr')
-rw-r--r--usr/Kconfig24
1 files changed, 12 insertions, 12 deletions
diff --git a/usr/Kconfig b/usr/Kconfig
index 2d4c77eecf2e..572dcf7b6a44 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -46,17 +46,17 @@ config INITRAMFS_ROOT_GID
46 If you are not sure, leave it set to "0". 46 If you are not sure, leave it set to "0".
47 47
48config RD_GZIP 48config RD_GZIP
49 bool "Support initial ramdisks compressed using gzip" if EXPERT 49 bool "Support initial ramdisks compressed using gzip"
50 default y
51 depends on BLK_DEV_INITRD 50 depends on BLK_DEV_INITRD
51 default y
52 select DECOMPRESS_GZIP 52 select DECOMPRESS_GZIP
53 help 53 help
54 Support loading of a gzip encoded initial ramdisk or cpio buffer. 54 Support loading of a gzip encoded initial ramdisk or cpio buffer.
55 If unsure, say Y. 55 If unsure, say Y.
56 56
57config RD_BZIP2 57config RD_BZIP2
58 bool "Support initial ramdisks compressed using bzip2" if EXPERT 58 bool "Support initial ramdisks compressed using bzip2"
59 default !EXPERT 59 default y
60 depends on BLK_DEV_INITRD 60 depends on BLK_DEV_INITRD
61 select DECOMPRESS_BZIP2 61 select DECOMPRESS_BZIP2
62 help 62 help
@@ -64,8 +64,8 @@ config RD_BZIP2
64 If unsure, say N. 64 If unsure, say N.
65 65
66config RD_LZMA 66config RD_LZMA
67 bool "Support initial ramdisks compressed using LZMA" if EXPERT 67 bool "Support initial ramdisks compressed using LZMA"
68 default !EXPERT 68 default y
69 depends on BLK_DEV_INITRD 69 depends on BLK_DEV_INITRD
70 select DECOMPRESS_LZMA 70 select DECOMPRESS_LZMA
71 help 71 help
@@ -73,17 +73,17 @@ config RD_LZMA
73 If unsure, say N. 73 If unsure, say N.
74 74
75config RD_XZ 75config RD_XZ
76 bool "Support initial ramdisks compressed using XZ" if EXPERT 76 bool "Support initial ramdisks compressed using XZ"
77 default !EXPERT
78 depends on BLK_DEV_INITRD 77 depends on BLK_DEV_INITRD
78 default y
79 select DECOMPRESS_XZ 79 select DECOMPRESS_XZ
80 help 80 help
81 Support loading of a XZ encoded initial ramdisk or cpio buffer. 81 Support loading of a XZ encoded initial ramdisk or cpio buffer.
82 If unsure, say N. 82 If unsure, say N.
83 83
84config RD_LZO 84config RD_LZO
85 bool "Support initial ramdisks compressed using LZO" if EXPERT 85 bool "Support initial ramdisks compressed using LZO"
86 default !EXPERT 86 default y
87 depends on BLK_DEV_INITRD 87 depends on BLK_DEV_INITRD
88 select DECOMPRESS_LZO 88 select DECOMPRESS_LZO
89 help 89 help
@@ -91,8 +91,8 @@ config RD_LZO
91 If unsure, say N. 91 If unsure, say N.
92 92
93config RD_LZ4 93config RD_LZ4
94 bool "Support initial ramdisks compressed using LZ4" if EXPERT 94 bool "Support initial ramdisks compressed using LZ4"
95 default !EXPERT 95 default y
96 depends on BLK_DEV_INITRD 96 depends on BLK_DEV_INITRD
97 select DECOMPRESS_LZ4 97 select DECOMPRESS_LZ4
98 help 98 help