mtd/fs Kconfig,1.5,1.6

[David Woodhouse]

Update of /home/cvs/mtd/fs
In directory phoenix.infradead.org:/tmp/cvs-serv5713

Modified Files:
	Kconfig 
Log Message:
Remove LZ-based compressors for now. Hide compression options

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/fs/Kconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Kconfig	1 Jun 2004 09:02:13 -0000	1.5
+++ Kconfig	15 Jul 2004 15:43:58 -0000	1.6
@@ -38,7 +38,7 @@
 	int "JFFS2 debugging verbosity (0 = quiet, 2 = noisy)"
 	depends on JFFS2_FS
 	default "0"
-	---help---
+	help
 	  This controls the amount of debugging messages produced by the JFFS2
 	  code. Set it to zero for use in production systems. For evaluation,
 	  testing and debugging, it's advisable to set it to one. This will
@@ -55,7 +55,7 @@
 	bool "JFFS2 support for NAND flash (EXPERIMENTAL)"
 	depends on JFFS2_FS && EXPERIMENTAL
 	default n
-	---help---
+	help
 	  This enables the experimental support for NAND flash in JFFS2. NAND
 	  is a newer type of flash chip design than the traditional NOR flash,
 	  with higher density but a handful of characteristics which make it
@@ -68,8 +68,20 @@
 	  Say 'N' unless you have NAND flash and you are willing to test and
 	  develop JFFS2 support for it.
 
+config JFFS2_COMPRESSION_OPTIONS
+	bool "Advanced compression options for JFFS2"
+	default n
+	help
+	  Enabling this option allows you to explicitly choose which
+	  compression modules, if any, are enabled in JFFS2. Removing
+	  compressors and mean you cannot read existing file systems,
+	  and enabling experimental compressors can mean that you
+	  write a file system which cannot be read by a standard kernel.
+
+	  If unsure, you should _definitely_ say 'N'.
+
 config JFFS2_ZLIB
-	bool "JFFS2 ZLIB compression support"
+	bool "JFFS2 ZLIB compression support" if JFFS2_COMPRESSION_OPTIONS
 	select ZLIB_INFLATE
 	select ZLIB_DEFLATE
 	depends on JFFS2_FS
@@ -83,36 +95,21 @@
           Say 'Y' if unsure.
 
 config JFFS2_RTIME
-	bool "JFFS2 RTIME compression support"
+	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
 	depends on JFFS2_FS
 	default y
         help
           Rtime does manage to recompress already-compressed data. Say 'Y' if unsure.
 
 config JFFS2_RUBIN
-	bool "JFFS2 RUBIN compression support"
+	bool "JFFS2 RUBIN compression support" if JFFS2_COMPRESSION_OPTIONS
 	depends on JFFS2_FS
 	default n
         help
           RUBINMIPS and DYNRUBIN compressors. Say 'N' if unsure.
 
-config JFFS2_LZO
-        bool "JFFS2 LZO compression support (EXPERIMENTAL)"
-        depends on JFFS2_FS && EXPERIMENTAL
-        default n
-        help
-          LZO1X-999 compression support. See http://www.oberhumer.com/opensource/lzo/
-          for more information.
-
-config JFFS2_LZARI
-        bool "JFFS2 LZARI compression support (EXPERIMENTAL)"
-        depends on JFFS2_FS && EXPERIMENTAL
-        default n
-        help
-          Lempel-Ziv-Storer-Sczymanski compression support with additional arithmetic coding.
-
 choice
-        prompt "JFFS2 default compression mode"
+        prompt "JFFS2 default compression mode" if JFFS2_COMPRESSION_OPTIONS
         default JFFS2_CMODE_PRIORITY
         depends on JFFS2_FS
         help
@@ -139,9 +136,9 @@
 endchoice
 
 config JFFS2_PROC
-	bool "JFFS2 proc interface support"
+	bool "JFFS2 proc interface support" if JFFS2_COMPRESSION_OPTIONS
 	depends on JFFS2_FS && PROC_FS
-	default y
+	default n
         help
           You can read some statistics and set the compression mode and
           compressor priorities with this interface.