aboutsummaryrefslogtreecommitdiffstats
path: root/usr/Kconfig
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-03-09 10:15:44 -0500
committerMichal Marek <mmarek@suse.cz>2011-03-09 10:15:44 -0500
commit2d8ad8719591fa803b0d589ed057fa46f49b7155 (patch)
tree4ae051577dad1161c91dafbf4207bb10a9dc91bb /usr/Kconfig
parent9b4ce7bce5f30712fd926ab4599a803314a07719 (diff)
parentc56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff)
Merge commit 'v2.6.38-rc1' into kbuild/packaging
Diffstat (limited to 'usr/Kconfig')
-rw-r--r--usr/Kconfig20
1 files changed, 19 insertions, 1 deletions
diff --git a/usr/Kconfig b/usr/Kconfig
index e2721f5a3504..4780deac5974 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -72,6 +72,15 @@ config RD_LZMA
72 Support loading of a LZMA encoded initial ramdisk or cpio buffer 72 Support loading of a LZMA encoded initial ramdisk or cpio buffer
73 If unsure, say N. 73 If unsure, say N.
74 74
75config RD_XZ
76 bool "Support initial ramdisks compressed using XZ" if EMBEDDED
77 default !EMBEDDED
78 depends on BLK_DEV_INITRD
79 select DECOMPRESS_XZ
80 help
81 Support loading of a XZ encoded initial ramdisk or cpio buffer.
82 If unsure, say N.
83
75config RD_LZO 84config RD_LZO
76 bool "Support initial ramdisks compressed using LZO" if EMBEDDED 85 bool "Support initial ramdisks compressed using LZO" if EMBEDDED
77 default !EMBEDDED 86 default !EMBEDDED
@@ -139,12 +148,21 @@ config INITRAMFS_COMPRESSION_LZMA
139 three. Compression is slowest. The initramfs size is about 33% 148 three. Compression is slowest. The initramfs size is about 33%
140 smaller with LZMA in comparison to gzip. 149 smaller with LZMA in comparison to gzip.
141 150
151config INITRAMFS_COMPRESSION_XZ
152 bool "XZ"
153 depends on RD_XZ
154 help
155 XZ uses the LZMA2 algorithm. The initramfs size is about 30%
156 smaller with XZ in comparison to gzip. Decompression speed
157 is better than that of bzip2 but worse than gzip and LZO.
158 Compression is slow.
159
142config INITRAMFS_COMPRESSION_LZO 160config INITRAMFS_COMPRESSION_LZO
143 bool "LZO" 161 bool "LZO"
144 depends on RD_LZO 162 depends on RD_LZO
145 help 163 help
146 Its compression ratio is the poorest among the four. The kernel 164 Its compression ratio is the poorest among the four. The kernel
147 size is about about 10% bigger than gzip; however its speed 165 size is about 10% bigger than gzip; however its speed
148 (both compression and decompression) is the fastest. 166 (both compression and decompression) is the fastest.
149 167
150endchoice 168endchoice