aboutsummaryrefslogtreecommitdiffstats
path: root/fs/romfs
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2009-02-20 07:31:54 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-03-24 05:02:39 -0400
commitf52fd5b7fd11e85fe9de15d5c5b5d574f9ff4cab (patch)
tree786d2d4f458294576584aff5862379076a483e0c /fs/romfs
parentda4458bda237aa0cb1688f6c359477f203788f6a (diff)
NOMMU: Fix the RomFS Kconfig to ensure at least one backing store is selected
Fix the configuration of the RomFS to make sure that at least one backing store method is always selected. This is done by rendering it down to a choice item that selects between Block, MTD and both. This also works correctly in the case that CONFIG_MTD=m: MTD cannot be selected as a backing store unless CONFIG_ROMFS_FS is also 'm'. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/romfs')
-rw-r--r--fs/romfs/Kconfig34
1 files changed, 28 insertions, 6 deletions
diff --git a/fs/romfs/Kconfig b/fs/romfs/Kconfig
index 802c742f002c..ce2d6bcc6266 100644
--- a/fs/romfs/Kconfig
+++ b/fs/romfs/Kconfig
@@ -1,6 +1,6 @@
1config ROMFS_FS 1config ROMFS_FS
2 tristate "ROM file system support" 2 tristate "ROM file system support"
3 depends on BLOCK 3 depends on BLOCK || MTD
4 ---help--- 4 ---help---
5 This is a very small read-only file system mainly intended for 5 This is a very small read-only file system mainly intended for
6 initial ram disks of installation disks, but it could be used for 6 initial ram disks of installation disks, but it could be used for
@@ -15,9 +15,19 @@ config ROMFS_FS
15 If you don't know whether you need it, then you don't need it: 15 If you don't know whether you need it, then you don't need it:
16 answer N. 16 answer N.
17 17
18config ROMFS_ON_BLOCK 18#
19 bool "Block device-backed ROM file system support" if (ROMFS_ON_MTD && EMBEDDED) 19# Select the backing stores to be supported
20 depends on ROMFS_FS && BLOCK 20#
21choice
22 prompt "RomFS backing stores"
23 depends on ROMFS_FS
24 default ROMFS_BACKED_BY_BLOCK
25 help
26 Select the backing stores to be supported.
27
28config ROMFS_BACKED_BY_BLOCK
29 bool "Block device-backed ROM file system support"
30 depends on BLOCK
21 help 31 help
22 This permits ROMFS to use block devices buffered through the page 32 This permits ROMFS to use block devices buffered through the page
23 cache as the medium from which to retrieve data. It does not allow 33 cache as the medium from which to retrieve data. It does not allow
@@ -25,9 +35,8 @@ config ROMFS_ON_BLOCK
25 35
26 If unsure, answer Y. 36 If unsure, answer Y.
27 37
28config ROMFS_ON_MTD 38config ROMFS_BACKED_BY_MTD
29 bool "MTD-backed ROM file system support" 39 bool "MTD-backed ROM file system support"
30 depends on ROMFS_FS
31 depends on MTD=y || (ROMFS_FS=m && MTD) 40 depends on MTD=y || (ROMFS_FS=m && MTD)
32 help 41 help
33 This permits ROMFS to use MTD based devices directly, without the 42 This permits ROMFS to use MTD based devices directly, without the
@@ -38,3 +47,16 @@ config ROMFS_ON_MTD
38 47
39 If unsure, answer Y. 48 If unsure, answer Y.
40 49
50config ROMFS_BACKED_BY_BOTH
51 bool "Both the above"
52 depends on BLOCK && (MTD=y || (ROMFS_FS=m && MTD))
53endchoice
54
55
56config ROMFS_ON_BLOCK
57 bool
58 default y if ROMFS_BACKED_BY_BLOCK || ROMFS_BACKED_BY_BOTH
59
60config ROMFS_ON_MTD
61 bool
62 default y if ROMFS_BACKED_BY_MTD || ROMFS_BACKED_BY_BOTH