mtd/include/linux/mtd nand.h,1.13,1.14

[gleixner at infradead.org]

Update of /home/cvs/mtd/include/linux/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv29900

Modified Files:
	nand.h 
Log Message:
force badblock marker location to byte 5 of oob, even if CONFIG_NAND_ECC_JFFS2 is not set

Index: nand.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/nand.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nand.h	28 Apr 2002 13:40:41 -0000	1.13
+++ nand.h	7 Aug 2002 11:12:01 -0000	1.14
@@ -3,7 +3,7 @@
  *
  *  Copyright (c) 2000 David Woodhouse <dwmw2 at mvhi.com>
  *                     Steven J. Hill <sjhill at cotw.com>
- *		       Thomas Gleixner <gleixner at autronix.de>
+ *		       Thomas Gleixner <tglx at linutronix.de>
  *
  * $Id$
  *
@@ -32,6 +32,9 @@
  *			command delay times for different chips
  *   04-28-2002 TG	OOB config defines moved from nand.c to avoid duplicate
  *			defines in jffs2/wbuf.c
+ *   08-07-2002 TG	forced bad block location to byte 5 of OOB, even if
+ *			CONFIG_MTD_NAND_ECC_JFFS2 is not set
+ *
  */
 #ifndef __LINUX_MTD_NAND_H
 #define __LINUX_MTD_NAND_H
@@ -179,13 +182,15 @@
 /*
 * Constants for oob configuration
 */
+#define NAND_FORCE_BADBPOS		5
+
 #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_ECCPOS4		6
+#define NAND_NOOB_ECCPOS5		7
+#define NAND_NOOB_BADBPOS		NAND_FORCE_BADBPOS
 #define NAND_NOOB_ECCVPOS		-1
 
 #define NAND_JFFS2_OOB_ECCPOS0		0
@@ -194,7 +199,7 @@
 #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_BADBPOS		NAND_FORCE_BADBPOS
 #define NAND_JFFS2_OOB_ECCVPOS		4
 
 #define NAND_JFFS2_OOB8_FSDAPOS		6