Merge branch 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/coolone...

[linux.git] / fs / romfs / Kconfig

diff --git a/fs/romfs/Kconfig b/fs/romfs/Kconfig
index 1a17020f9faf3a40c4e52e8bdbf75f3ffa327bce..ce2d6bcc6266b4e663ddc0608354141aca4a75b7 100644 (file)
--- a/fs/romfs/Kconfig
+++ b/fs/romfs/Kconfig
@@ -1,6 +1,6 @@
 config ROMFS_FS
        tristate "ROM file system support"
-       depends on BLOCK
+       depends on BLOCK || MTD
        ---help---
          This is a very small read-only file system mainly intended for
          initial ram disks of installation disks, but it could be used for
@@ -14,3 +14,49 @@ config ROMFS_FS
 
          If you don't know whether you need it, then you don't need it:
          answer N.
+
+#
+# Select the backing stores to be supported
+#
+choice
+       prompt "RomFS backing stores"
+       depends on ROMFS_FS
+       default ROMFS_BACKED_BY_BLOCK
+       help
+         Select the backing stores to be supported.
+
+config ROMFS_BACKED_BY_BLOCK
+       bool "Block device-backed ROM file system support"
+       depends on BLOCK
+       help
+         This permits ROMFS to use block devices buffered through the page
+         cache as the medium from which to retrieve data.  It does not allow
+         direct mapping of the medium.
+
+         If unsure, answer Y.
+
+config ROMFS_BACKED_BY_MTD
+       bool "MTD-backed ROM file system support"
+       depends on MTD=y || (ROMFS_FS=m && MTD)
+       help
+         This permits ROMFS to use MTD based devices directly, without the
+         intercession of the block layer (which may have been disabled).  It
+         also allows direct mapping of MTD devices through romfs files under
+         NOMMU conditions if the underlying device is directly addressable by
+         the CPU.
+
+         If unsure, answer Y.
+
+config ROMFS_BACKED_BY_BOTH
+       bool "Both the above"
+       depends on BLOCK && (MTD=y || (ROMFS_FS=m && MTD))
+endchoice
+
+
+config ROMFS_ON_BLOCK
+       bool
+       default y if ROMFS_BACKED_BY_BLOCK || ROMFS_BACKED_BY_BOTH
+
+config ROMFS_ON_MTD
+       bool
+       default y if ROMFS_BACKED_BY_MTD || ROMFS_BACKED_BY_BOTH