MAINTAINERS: Hand MIPS over to Thomas

[tomoyo/tomoyo-test1.git] / usr / Kconfig

diff --git a/usr/Kconfig b/usr/Kconfig
index a6b6850..bdf5bbd 100644 (file)
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -54,7 +54,6 @@ config INITRAMFS_ROOT_GID
 
 config RD_GZIP
        bool "Support initial ramdisk/ramfs compressed using gzip"
-       depends on BLK_DEV_INITRD
        default y
        select DECOMPRESS_GZIP
        help
@@ -64,7 +63,6 @@ config RD_GZIP
 config RD_BZIP2
        bool "Support initial ramdisk/ramfs compressed using bzip2"
        default y
-       depends on BLK_DEV_INITRD
        select DECOMPRESS_BZIP2
        help
          Support loading of a bzip2 encoded initial ramdisk or cpio buffer
@@ -73,7 +71,6 @@ config RD_BZIP2
 config RD_LZMA
        bool "Support initial ramdisk/ramfs compressed using LZMA"
        default y
-       depends on BLK_DEV_INITRD
        select DECOMPRESS_LZMA
        help
          Support loading of a LZMA encoded initial ramdisk or cpio buffer
@@ -81,7 +78,6 @@ config RD_LZMA
 
 config RD_XZ
        bool "Support initial ramdisk/ramfs compressed using XZ"
-       depends on BLK_DEV_INITRD
        default y
        select DECOMPRESS_XZ
        help
@@ -91,7 +87,6 @@ config RD_XZ
 config RD_LZO
        bool "Support initial ramdisk/ramfs compressed using LZO"
        default y
-       depends on BLK_DEV_INITRD
        select DECOMPRESS_LZO
        help
          Support loading of a LZO encoded initial ramdisk or cpio buffer
@@ -100,7 +95,6 @@ config RD_LZO
 config RD_LZ4
        bool "Support initial ramdisk/ramfs compressed using LZ4"
        default y
-       depends on BLK_DEV_INITRD
        select DECOMPRESS_LZ4
        help
          Support loading of a LZ4 encoded initial ramdisk or cpio buffer
@@ -108,8 +102,7 @@ config RD_LZ4
 
 choice
        prompt "Built-in initramfs compression mode"
-       depends on INITRAMFS_SOURCE!=""
-       optional
+       depends on INITRAMFS_SOURCE != ""
        help
          This option allows you to decide by which algorithm the builtin
          initramfs will be compressed.  Several compression algorithms are
@@ -215,21 +208,3 @@ config INITRAMFS_COMPRESSION_LZ4
          by default which could cause a build failure.
 
 endchoice
-
-config INITRAMFS_COMPRESSION
-       depends on INITRAMFS_SOURCE!=""
-       string
-       default ""      if INITRAMFS_COMPRESSION_NONE
-       default ".gz"   if INITRAMFS_COMPRESSION_GZIP
-       default ".bz2"  if INITRAMFS_COMPRESSION_BZIP2
-       default ".lzma" if INITRAMFS_COMPRESSION_LZMA
-       default ".xz"   if INITRAMFS_COMPRESSION_XZ
-       default ".lzo"  if INITRAMFS_COMPRESSION_LZO
-       default ".lz4"  if INITRAMFS_COMPRESSION_LZ4
-       default ".gz"   if RD_GZIP
-       default ".lz4"  if RD_LZ4
-       default ".lzo"  if RD_LZO
-       default ".xz"   if RD_XZ
-       default ".lzma" if RD_LZMA
-       default ".bz2"  if RD_BZIP2
-       default ""