Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d34fb8e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bzip2-lzma-for-linus' of... 

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

* '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
parents 503e5763 40297927

usr/Kconfig

+33 −21
Original line number Diff line number Diff line
@@ -46,49 +46,50 @@ config INITRAMFS_ROOT_GID 
	  If you are not sure, leave it set to "0".



config RD_GZIP

	bool "Initial ramdisk compressed using gzip"

	bool "Support initial ramdisks compressed using gzip" if EMBEDDED

	default y

	depends on BLK_DEV_INITRD=y

	depends on BLK_DEV_INITRD

	select DECOMPRESS_GZIP

	help

	  Support loading of a gzip encoded initial ramdisk or cpio buffer.

	  If unsure, say Y.



config RD_BZIP2

	bool "Initial ramdisk compressed using bzip2"

	default n

	depends on BLK_DEV_INITRD=y

	bool "Support initial ramdisks compressed using bzip2" if EMBEDDED

	default !EMBEDDED

	depends on BLK_DEV_INITRD

	select DECOMPRESS_BZIP2

	help

	  Support loading of a bzip2 encoded initial ramdisk or cpio buffer

	  If unsure, say N.



config RD_LZMA

	bool "Initial ramdisk compressed using lzma"

	default n

	depends on BLK_DEV_INITRD=y

	bool "Support initial ramdisks compressed using LZMA" if EMBEDDED

	default !EMBEDDED

	depends on BLK_DEV_INITRD

	select DECOMPRESS_LZMA

	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 INITRAMFS_SOURCE!=""



choice

	prompt "Built-in initramfs compression mode"

	help

	  This setting is only meaningful if the INITRAMFS_SOURCE is

	  set. It decides by which algorithm the INITRAMFS_SOURCE will

	  be compressed.

	  Several compression algorithms are available, which differ

	  in efficiency, compression and decompression speed.

	  Compression speed is only relevant when building a kernel.

	  Decompression speed is relevant at each boot.



	  If you have any problems with bzip2 or lzma compressed

	  This option decides by which algorithm the builtin initramfs

	  will be compressed.  Several compression algorithms are

	  available, which differ in efficiency, compression and

	  decompression speed.  Compression speed is only relevant

	  when building a kernel.  Decompression speed is relevant at

	  each boot.



	  If you have any problems with bzip2 or LZMA compressed

	  initramfs, mail me (Alain Knaff) <alain@knaff.lu>.



	  High compression options are mostly useful for users who

	  are low on disk space (embedded systems), but for whom ram

	  size matters less.

	  High compression options are mostly useful for users who are

	  low on RAM, since it reduces the memory consumption during

	  boot.



	  If in doubt, select 'gzip'
@@ -133,3 +134,14 @@ config INITRAMFS_COMPRESSION_LZMA 
	  smaller with LZMA in comparison to gzip.



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