mtd/drivers/mtd/nand nand.c,1.23,1.24

[gleixner at infradead.org]

Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv9103/mtd/drivers/mtd/nand

Modified Files:
	nand.c 
Log Message:
oob config defines moved to nand.h

Index: nand.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nand.c	10 Apr 2002 00:31:27 -0000	1.23
+++ nand.c	28 Apr 2002 13:39:48 -0000	1.24
@@ -44,6 +44,9 @@
  *  04-09-2002  Thomas Gleixner (gleixner at autronix.de)
  *		- nand_wait repaired
  *
+ *  04-28-2002  Thomas Gleixner (gleixner at autronix.de)	
+ *		- OOB config defines moved to nand.h 
+ *
  * $Id$
  *
  * This program is free software; you can redistribute it and/or modify
@@ -86,26 +89,6 @@
 	int eccvalid_pos;	/* position of ECC valid flag inside oob -1 = inactive */
 };
 
-/*
-* Constants for oob configuration
-*/
-#define NAND_NOOB_ECCPOS0	0
-#define NAND_NOOB_ECCPOS1	1
-#define NAND_NOOB_ECCPOS2	2
-#define NAND_NOOB_ECCPOS3	3
-#define NAND_NOOB_ECCPOS4	4
-#define NAND_NOOB_ECCPOS5	5
-#define NAND_NOOB_BADBPOS	-1
-#define NAND_NOOB_ECCVPOS	-1
-
-#define NAND_JFFS2_OOB_ECCPOS0	0
-#define NAND_JFFS2_OOB_ECCPOS1	1
-#define NAND_JFFS2_OOB_ECCPOS2	2
-#define NAND_JFFS2_OOB_ECCPOS3	3
-#define NAND_JFFS2_OOB_ECCPOS4	6
-#define NAND_JFFS2_OOB_ECCPOS5	7
-#define NAND_JFFS2_OOB_BADBPOS	5
-#define NAND_JFFS2_OOB_ECCVPOS	4
 
 static struct nand_oob_config oob_config;
 /*
@@ -301,8 +284,10 @@
 {
 
 	int i, status;
+#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
 #ifdef CONFIG_MTD_NAND_ECC
 	int ecc_bytes = (mtd->oobblock == 512) ? 6 : 3;
+#endif
 #endif
 	/* pad oob area */
 	for (i = mtd->oobblock; i < mtd->oobblock + mtd->oobsize; i++)