NAND read/write.jffs2 fix

index eff9173..64e825e 100644
@@ -73,9 +73,10 @@ static int nand_dump(nand_info_t *nand, ulong off, int only_oob)
 	while (i--) {
 		if (!only_oob) {
 			printf( "\t%02x %02x %02x %02x %02x %02x %02x %02x"
-					"  %02x %02x %02x %02x %02x %02x %02x %02x\n",
-					p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],
-					p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]);
+				"  %02x %02x %02x %02x %02x %02x %02x %02x\n",
+				p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],
+				p[8], p[9], p[10], p[11], p[12], p[13], p[14],
+				p[15]);
 		}
 		p += 16;
 	}

@@ -319,7 +320,6 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 	}
 
-	/* read write */
 	if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) {
 		int read;
 

@@ -334,33 +334,13 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 			return 1;
 
 		s = strchr(cmd, '.');
-		if (s != NULL &&
-		    (!strcmp(s, ".jffs2") || !strcmp(s, ".e") || !strcmp(s, ".i"))) {
-			if (read) {
-				/* read */
-				nand_read_options_t opts;
-				memset(&opts, 0, sizeof(opts));
-				opts.buffer	= (u_char*) addr;
-				opts.length	= size;
-				opts.offset	= off;
-				opts.quiet      = quiet;
-/*
- *  ! BROKEN !
- *
- *  TODO: Function must be implemented
- *
- *				ret = nand_read_opts(nand, &opts);
- */
-			} else {
-				/* write */
-				mtd_oob_ops_t opts;
-				memset(&opts, 0, sizeof(opts));
-				opts.datbuf	= (u_char*) addr;
-				opts.len	= size;
-				opts.ooblen	= 64;
-				opts.mode	= MTD_OOB_AUTO;
-				ret = nand_write_opts(nand, off, &opts);
-			}
+		if (s != NULL && (!strcmp(s, ".jffs2") ||
+				  !strcmp(s, ".e") || !strcmp(s, ".i"))) {
+			if (read)
+				ret = nand_read_skip_bad(nand, off, &size, (u_char *)addr);
+			else
+				ret = nand_write_skip_bad(nand, off, &size, (u_char *)addr);
+
 		} else if (s != NULL && !strcmp(s, ".oob")) {
 			struct mtd_oob_ops ops;
 

@@ -374,7 +354,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 				ret = nand->write_oob(nand, off, &ops);
 		} else {
 			if (read)
-				ret = nand_read(nand, off, &size, (u_char *)addr);
+				ret = nand_read_ff_upon_bad(nand, off, &size, (u_char *)addr);
 			else
 				ret = nand_write(nand, off, &size, (u_char *)addr);
 		}

@@ -399,6 +379,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 		}
 		return 1;
 	}
+
 	if (strcmp(cmd, "biterr") == 0) {
 		/* todo */
 		return 1;

@@ -489,23 +470,31 @@ usage:
 	return 1;
 }
 
-U_BOOT_CMD(nand, 5, 1, do_nand,
-	"nand    - NAND sub-system\n",
-	"info                  - show available NAND devices\n"
-	"nand device [dev]     - show or set current device\n"
-	"nand read[.jffs2]     - addr off|partition size\n"
-	"nand write[.jffs2]    - addr off|partition size - read/write `size' bytes starting\n"
-	"    at offset `off' to/from memory address `addr'\n"
-	"nand erase [clean] [off size] - erase `size' bytes from\n"
-	"    offset `off' (entire device if not specified)\n"
+U_BOOT_CMD(
+nand, 5, 1, do_nand,
+	"nand - NAND sub-system\n",
+	"info - show available NAND devices\n"
+	"nand device [dev] - show or set current device\n"
+	"nand read[.jffs2|.i|.e] addr off|partition size - read `size' bytes\n"
+	" starting at offset `off' to memory address `addr'. Using one of the\n"
+	" `.' options bad blocks are skipped, otherwise they are read as 0xff\n"
+	"nand write[.jffs2|.i|.e] addr off|partition size - write `size'\n"
+	" bytes starting at offset `off' from memory address `addr'. Using\n"
+	" one of `.' options bad blocks is skipped otherwise write fails\n"
+	"nand erase [clean] [off size] - erase `size' bytes from offset\n"
+	" `off' (entire device if not specified)\n"
 	"nand bad - show bad blocks\n"
 	"nand dump[.oob] off - dump page\n"
 	"nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n"
 	"nand markbad off - mark bad block at offset (UNSAFE)\n"
 	"nand biterr off - make a bit error at offset (UNSAFE)\n"
-	"nand lock [tight] [status] - bring nand to lock state or display locked pages\n"
+	"nand lock [tight] [status] - bring nand to lock state or display\n"
+	" locked pages\n"
 	"nand unlock [offset] [size] - unlock section\n");
 
+
+
+
 static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
 			   ulong offset, ulong addr, char *cmd)
 {

823 lines not on this page · raw message

index 67dedbe..6e755c9 100644
@@ -106,9 +106,12 @@ struct nand_erase_options {
 
 typedef struct nand_erase_options nand_erase_options_t;
 
-int nand_write_opts(nand_info_t *mtd, loff_t to, mtd_oob_ops_t *ops);
-
-int nand_read_opts(nand_info_t *meminfo, const nand_read_options_t *opts);
+int nand_read_ff_upon_bad(nand_info_t *nand, ulong offset, ulong *length,
+			  u_char *buffer);
+int nand_read_skip_bad(nand_info_t *nand, ulong offset, ulong *length,
+		       u_char *buffer);
+int nand_write_skip_bad(nand_info_t *nand, ulong offset, ulong *length,
+			u_char *buffer);
 int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts);
 
 #define NAND_LOCK_STATUS_TIGHT	0x01