lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip

Browse Source 
* 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
  bzip2/lzma: don't ask for compression mode for the default initramfs
  bzip2/lzma: consistently capitalize LZMA in Kconfig
  bzip2/lzma: clarify the meaning of the CONFIG_RD_ options
  bzip2/lzma: move CONFIG_RD_* options under CONFIG_EMBEDDED
This commit is contained in:
Linus Torvalds
2009-03-29 13:05:41 -07:00
parent 503e576303 4029792757
commit 0d34fb8e93
1 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
usr/Kconfig
View File

@@ -46,49 +46,50 @@ 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 "Initial ramdisk compressed using gzip" bool "Support initial ramdisks compressed using gzip" if EMBEDDED
default y default y
depends on BLK_DEV_INITRD=y depends on BLK_DEV_INITRD
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 "Initial ramdisk compressed using bzip2" bool "Support initial ramdisks compressed using bzip2" if EMBEDDED
default n default !EMBEDDED
depends on BLK_DEV_INITRD=y depends on BLK_DEV_INITRD
select DECOMPRESS_BZIP2 select DECOMPRESS_BZIP2
help help
Support loading of a bzip2 encoded initial ramdisk or cpio buffer Support loading of a bzip2 encoded initial ramdisk or cpio buffer
If unsure, say N. If unsure, say N.
config RD_LZMA config RD_LZMA
bool "Initial ramdisk compressed using lzma" bool "Support initial ramdisks compressed using LZMA" if EMBEDDED
default n default !EMBEDDED
depends on BLK_DEV_INITRD=y depends on BLK_DEV_INITRD
select DECOMPRESS_LZMA select DECOMPRESS_LZMA
help help
Support loading of a lzma encoded initial ramdisk or cpio buffer Support loading of a LZMA encoded initial ramdisk or cpio buffer
If unsure, say N. If unsure, say N.
if INITRAMFS_SOURCE!=""
choice choice
prompt "Built-in initramfs compression mode" prompt "Built-in initramfs compression mode"
help help
This setting is only meaningful if the INITRAMFS_SOURCE is This option decides by which algorithm the builtin initramfs
set. It decides by which algorithm the INITRAMFS_SOURCE will will be compressed. Several compression algorithms are
be compressed. available, which differ in efficiency, compression and
Several compression algorithms are available, which differ decompression speed. Compression speed is only relevant
in efficiency, compression and decompression speed. when building a kernel. Decompression speed is relevant at
Compression speed is only relevant when building a kernel. each boot.
Decompression speed is relevant at each boot.
If you have any problems with bzip2 or lzma compressed If you have any problems with bzip2 or LZMA compressed
initramfs, mail me (Alain Knaff) <alain@knaff.lu>. initramfs, mail me (Alain Knaff) <alain@knaff.lu>.
High compression options are mostly useful for users who High compression options are mostly useful for users who are
are low on disk space (embedded systems), but for whom ram low on RAM, since it reduces the memory consumption during
size matters less. boot.
If in doubt, select 'gzip' If in doubt, select 'gzip'
@@ -133,3 +134,14 @@ config INITRAMFS_COMPRESSION_LZMA
smaller with LZMA in comparison to gzip. smaller with LZMA in comparison to gzip.
endchoice endchoice
endif
if INITRAMFS_SOURCE=""
# The builtin initramfs is so small so we don't want to bug the user...
config INITRAMFS_COMPRESSION_NONE
bool
default y
endif