[Yaffs] [PATCH YAFFS2 8/8] new-config-scheme

Top Page
Attachments:
Message as email
+ (text/plain)
+ 8-new-config-scheme.diff (text/plain)
Delete this message
Reply to this message
Author: Luc Van Oostenryck
Date:  
To: yaffs
Subject: [Yaffs] [PATCH YAFFS2 8/8] new-config-scheme
Set the new much simpler config scheme as proposed by Charles.




-- Luc Van Oostenryck
diff --git a/fs/Makefile b/fs/Makefile
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -83,7 +83,7 @@ obj-$(CONFIG_UFS_FS)        += ufs/
 obj-$(CONFIG_EFS_FS)        += efs/
 obj-$(CONFIG_JFFS_FS)        += jffs/
 obj-$(CONFIG_JFFS2_FS)        += jffs2/
-obj-$(CONFIG_YAFFS2_FS)        += yaffs2/
+obj-$(CONFIG_YAFFS_FS)        += yaffs2/
 obj-$(CONFIG_AFFS_FS)        += affs/
 obj-$(CONFIG_ROMFS_FS)        += romfs/
 obj-$(CONFIG_QNX4FS_FS)        += qnx4/
diff --git a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig
--- a/fs/yaffs2/Kconfig
+++ b/fs/yaffs2/Kconfig
@@ -35,21 +35,20 @@ config YAFFS_YAFFS2


       If unsure, say Y.


-config YAFFS_USE_NANDECC
-    bool "Use ECC functions of the generic MTD-NAND driver"
-    depends on YAFFS_FS
-    default y
+config YAFFS_DOES_ECC
+    bool "Lets Yaffs do its own ECC"
+    depends on YAFFS_FS && YAFFS_YAFFS1
+    default n
     help
-      This enables the ECC functions of the generic MTD-NAND driver.
-      This will not work if you are using the old mtd.
+      This enables Yaffs to use its own ECC functions instead of using
+      the ones from the generic MTD-NAND driver.


-      NB Use NAND ECC does not work at present with yaffsram.
-
-      If unsure, say Y.
+      If unsure, say N.


 config YAFFS_ECC_WRONG_ORDER
     bool "Use the same ecc byte order as Steven Hill's nand_ecc.c"
-    depends on YAFFS_FS && !YAFFS_USE_NANDECC
+    depends on YAFFS_FS && YAFFS_DOES_ECC
+    default n
     help
       This makes yaffs_ecc.c use the same ecc byte order as
       Steven Hill's nand_ecc.c. If not set, then you get the
diff --git a/fs/yaffs2/Makefile b/fs/yaffs2/Makefile
--- a/fs/yaffs2/Makefile
+++ b/fs/yaffs2/Makefile
@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #


-obj-$(CONFIG_YAFFS2_FS) += yaffs2.o
+obj-$(CONFIG_YAFFS_FS) += yaffs2.o

 yaffs2-y := yaffs_fs.o        \
     yaffs_guts.o        \
@@ -19,7 +19,7 @@ yaffs2-y := yaffs_fs.o        \
     yaffs_packedtags2.o    \
     yaffs_tagsvalidity.o    \
     yaffs_mtdif.o        \
+    yaffs_ecc.o        \


-yaffs2-$(CONFIG_YAFFS2_MTD_ENABLED)    += yaffs_mtdif2.o
+yaffs2-$(CONFIG_YAFFS_YAFFS2)        += yaffs_mtdif2.o
 yaffs2-$(CONFIG_YAFFS_NANDEMUL2K)    += mtdemul/nandemul2k.o
-yaffs2-$(CONFIG_YAFFS_USE_NANDECC)    += yaffs_ecc.o
diff --git a/fs/yaffs2/yaffs_fs.c b/fs/yaffs2/yaffs_fs.c
--- a/fs/yaffs2/yaffs_fs.c
+++ b/fs/yaffs2/yaffs_fs.c
@@ -1409,7 +1409,7 @@ static struct super_block *yaffs_interna

    
     dev->putSuperFunc = yaffs_MTDPutSuper;

    
-#ifdef CONFIG_YAFFS_USE_NANDECC
+#ifndef CONFIG_YAFFS_DOES_ECC
     dev->useNANDECC = 1;
 #endif