X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=common%2Fcmd_nand.c;h=be14b5f6caeb2192f6309a0f43949a5b39f70016;hb=6e2704e3f1a51dcd1d378db779043d1cfb4978db;hp=8b1e01ae8094f9a4236f6d9897a8e341121f987c;hpb=eecf9e2e78c3af4304740804b3649f3d4b8a922a;p=karo-tx-uboot.git

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 8b1e01ae80..be14b5f6ca 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -426,7 +426,7 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,
 }
 
 /* Adjust a chip/partition size down for bad blocks so we don't
- * read/write/erase past the end of a chip/partition by accident.
+ * read/write past the end of a chip/partition by accident.
  */
 static void adjust_size_for_badblocks(loff_t *size, loff_t offset, int dev)
 {
@@ -477,7 +477,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	/* Only "dump" is repeatable. */
 	if (repeat && strcmp(cmd, "dump"))
-		return 0;
+		return CMD_RET_FAILURE;
 
 	if (strcmp(cmd, "info") == 0) {
 
@@ -486,7 +486,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			if (nand_info[i].name)
 				nand_print_and_set_info(i);
 		}
-		return 0;
+		return CMD_RET_SUCCESS;
 	}
 
 	if (strcmp(cmd, "device") == 0) {
@@ -496,19 +496,20 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 				puts("no devices available\n");
 			else
 				nand_print_and_set_info(dev);
-			return 0;
+			return CMD_RET_SUCCESS;
 		}
 
 		dev = (int)simple_strtoul(argv[2], NULL, 10);
 		set_dev(dev);
 
-		return 0;
+		return CMD_RET_SUCCESS;
 	}
 
 #ifdef CONFIG_ENV_OFFSET_OOB
 	/* this command operates only on the first nand device */
 	if (strcmp(cmd, "env.oob") == 0)
-		return do_nand_env_oob(cmdtp, argc - 1, argv + 1);
+		return do_nand_env_oob(cmdtp, argc - 1, argv + 1) ?
+			CMD_RET_FAILURE : CMD_RET_SUCCESS;;
 #endif
 
 	/* The following commands operate on the current device, unless
@@ -520,7 +521,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
 	    !nand_info[dev].name) {
 		puts("\nno devices available\n");
-		return 1;
+		return CMD_RET_FAILURE;
 	}
 	nand = &nand_info[dev];
 
@@ -529,7 +530,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		for (off = 0; off < nand->size; off += nand->erasesize)
 			if (nand_block_isbad(nand, off))
 				printf("  %08llx\n", (unsigned long long)off);
-		return 0;
+		return CMD_RET_SUCCESS;
 	}
 
 	/*
@@ -546,7 +547,6 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		int scrub = !strncmp(cmd, "scrub", 5);
 		int spread = 0;
 		int args = 2;
-		int adjust_size = 0;
 		const char *scrub_warn =
 			"Warning: "
 			"scrub option will erase all factory set bad blocks!\n"
@@ -563,10 +563,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 				spread = 1;
 			} else if (!strcmp(&cmd[5], ".part")) {
 				args = 1;
-				adjust_size = 1;
 			} else if (!strcmp(&cmd[5], ".chip")) {
 				args = 0;
-				adjust_size = 1;
 			} else {
 				goto usage;
 			}
@@ -584,11 +582,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		/* skip first two or three arguments, look for offset and size */
 		if (arg_off_size(argc - o, argv + o, &dev, &off, &size,
 				 &maxsize) != 0)
-			return 1;
-
-		/* size is unspecified */
-		if (adjust_size && !scrub)
-			adjust_size_for_badblocks(&size, off, dev);
+			return CMD_RET_FAILURE;
 
 		nand = &nand_info[dev];
 
@@ -611,17 +605,17 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 					opts.scrub = 1;
 				else {
 					puts("scrub aborted\n");
-					return -1;
+					return CMD_RET_FAILURE;
 				}
 			} else {
 				puts("scrub aborted\n");
-				return -1;
+				return CMD_RET_FAILURE;
 			}
 		}
 		ret = nand_erase_opts(nand, &opts);
 		printf("%s\n", ret ? "ERROR" : "OK");
 
-		return ret == 0 ? 0 : 1;
+		return ret == 0 ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 	}
 
 	if (strncmp(cmd, "dump", 4) == 0) {
@@ -631,7 +625,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		off = (int)simple_strtoul(argv[2], NULL, 16);
 		ret = nand_dump(nand, off, !strcmp(&cmd[4], ".oob"), repeat);
 
-		return ret == 0 ? 1 : 0;
+		return ret == 0 ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 	}
 
 	if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) {
@@ -694,7 +688,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		} else if (!strcmp(s, ".trimffs")) {
 			if (read) {
 				printf("Unknown nand command suffix '%s'\n", s);
-				return 1;
+				return CMD_RET_FAILURE;
 			}
 			ret = nand_write_skip_bad(nand, off, &rwsize, NULL,
 						maxsize, (u_char *)addr,
@@ -704,7 +698,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		} else if (!strcmp(s, ".yaffs")) {
 			if (read) {
 				printf("Unknown nand command suffix '%s'.\n", s);
-				return 1;
+				return CMD_RET_FAILURE;
 			}
 			ret = nand_write_skip_bad(nand, off, &rwsize, NULL,
 						maxsize, (u_char *)addr,
@@ -726,13 +720,13 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			ret = raw_access(nand, addr, off, pagecount, read);
 		} else {
 			printf("Unknown nand command suffix '%s'.\n", s);
-			return 1;
+			return CMD_RET_FAILURE;
 		}
 
 		printf(" %zu bytes %s: %s\n", rwsize,
 		       read ? "read" : "written", ret ? "ERROR" : "OK");
 
-		return ret == 0 ? 0 : 1;
+		return ret == 0 ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 	}
 
 #ifdef CONFIG_CMD_NAND_TORTURE
@@ -777,12 +771,12 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			--argc;
 			++argv;
 		}
-		return ret;
+		return ret == 0 ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 	}
 
 	if (strcmp(cmd, "biterr") == 0) {
 		/* todo */
-		return 1;
+		return CMD_RET_FAILURE;
 	}
 
 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
@@ -802,10 +796,10 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 				puts("NAND flash successfully locked\n");
 			} else {
 				puts("Error locking NAND flash\n");
-				return 1;
+				return CMD_RET_FAILURE;
 			}
 		}
-		return 0;
+		return CMD_RET_SUCCESS;
 	}
 
 	if (strncmp(cmd, "unlock", 5) == 0) {
@@ -818,16 +812,16 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 		if (arg_off_size(argc - 2, argv + 2, &dev, &off, &size,
 				 &maxsize) < 0)
-			return 1;
+			return CMD_RET_FAILURE;
 
 		if (!nand_unlock(&nand_info[dev], off, size, allexcept)) {
 			puts("NAND flash successfully unlocked\n");
 		} else {
 			puts("Error unlocking NAND flash, "
 			     "write and erase will probably fail\n");
-			return 1;
+			return CMD_RET_FAILURE;
 		}
-		return 0;
+		return CMD_RET_SUCCESS;
 	}
 #endif