Commit fb9a4ca9 authored by H. Peter Anvin's avatar H. Peter Anvin

bzip2/lzma: move initrd/ramfs options out of BLK_DEV

Impact: Partial resolution of build failure

Move the initrd/initramfs configuration options from
drivers/block/Kconfig to usr/Kconfig, since they do not and should not
depend on CONFIG_BLK_DEV.  This fixes builds when CONFIG_BLK_DEV=n.
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 7856a16e
...@@ -358,33 +358,6 @@ config BLK_DEV_XIP ...@@ -358,33 +358,6 @@ config BLK_DEV_XIP
will prevent RAM block device backing store memory from being will prevent RAM block device backing store memory from being
allocated from highmem (only a problem for highmem systems). allocated from highmem (only a problem for highmem systems).
config RD_GZIP
bool "Initial ramdisk compressed using gzip"
default y
depends on BLK_DEV_INITRD=y
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
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
select DECOMPRESS_LZMA
help
Support loading of a lzma encoded initial ramdisk or cpio buffer
If unsure, say N.
config CDROM_PKTCDVD config CDROM_PKTCDVD
tristate "Packet writing on CD/DVD media" tristate "Packet writing on CD/DVD media"
depends on !UML depends on !UML
......
...@@ -44,3 +44,30 @@ config INITRAMFS_ROOT_GID ...@@ -44,3 +44,30 @@ config INITRAMFS_ROOT_GID
owned by group root in the initial ramdisk image. owned by group root in the initial ramdisk image.
If you are not sure, leave it set to "0". If you are not sure, leave it set to "0".
config RD_GZIP
bool "Initial ramdisk compressed using gzip"
default y
depends on BLK_DEV_INITRD=y
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
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
select DECOMPRESS_LZMA
help
Support loading of a lzma encoded initial ramdisk or cpio buffer
If unsure, say N.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment