summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-03-28 23:49:08 +0100
committerH. Peter Anvin <hpa@zytor.com>2009-03-28 23:49:08 +0100
commit73d8a12f05292d86623b4ec7bf5fd75d5ad5f687 (patch)
tree87461219c32f74cd935e525031ff67971ff1b95f
parentMerge commit 'v2.6.29' into x86/setup-lzma (diff)
downloadlinux-73d8a12f05292d86623b4ec7bf5fd75d5ad5f687.tar.xz
linux-73d8a12f05292d86623b4ec7bf5fd75d5ad5f687.zip
bzip2/lzma: move CONFIG_RD_* options under CONFIG_EMBEDDED
Impact: reduce Kconfig noise Move the options that control possible initramfs/initrd compressions underneath CONFIG_EMBEDDED. The only impact of leaving these options set to y is additional code in the init section of the kernel; there is no reason to burden non-embedded users with these options. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--usr/Kconfig16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr/Kconfig b/usr/Kconfig
index 43a3a0fe8f29..5166078d45f2 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -46,27 +46,27 @@ config INITRAMFS_ROOT_GID
If you are not sure, leave it set to "0".
config RD_GZIP
- bool "Initial ramdisk compressed using gzip"
+ bool "Initial ramdisk 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 "Initial ramdisk 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 "Initial ramdisk 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