minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

nand/onenand: Fix missing argument checking for "markbad" command

Browse Source 
The "nand markbad" and "onenand markbad" commands did not check if an
argument was passed; if this was forgotten, no error was raised but
block 0 was marked as bad.

While fixing this bug, clean up the code a bit and allow to pass more
than one block address, thus allowing to mark several blocks as bad
in a single command invocation.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Wolfgang Denk 2009-05-24 17:34:33 +02:00 committed by Scott Wood
parent cd84423a09
commit 8360b66bac
2 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/cmd_nand.c
View File

@ -414,18 +414,29 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
} }
if (strcmp(cmd, "markbad") == 0) { if (strcmp(cmd, "markbad") == 0) {
addr = (ulong)simple_strtoul(argv[2], NULL, 16); argc -= 2;
argv += 2;
int ret = nand->block_markbad(nand, addr); if (argc <= 0)
if (ret == 0) { goto usage;
printf("block 0x%08lx successfully marked as bad\n",
(ulong) addr); while (argc > 0) {
return 0; addr = simple_strtoul(*argv, NULL, 16);
if (nand->block_markbad(nand, addr)) {
printf("block 0x%08lx NOT marked "
"as bad! ERROR %d\n",
addr, ret);
ret = 1;
} else { } else {
printf("block 0x%08lx NOT marked as bad! ERROR %d\n", printf("block 0x%08lx successfully "
(ulong) addr, ret); "marked as bad\n",
addr);
} }
return 1; --argc;
++argv;
}
return ret;
} }
if (strcmp(cmd, "biterr") == 0) { if (strcmp(cmd, "biterr") == 0) {

33
common/cmd_onenand.c
View File

@ -340,7 +340,7 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
int blocksize; int blocksize;
ulong addr, ofs; ulong addr, ofs;
size_t len, retlen = 0; size_t len, retlen = 0;
int ret; int ret = 0;
char *cmd, *s; char *cmd, *s;
mtd = &onenand_mtd; mtd = &onenand_mtd;
@ -434,18 +434,29 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
} }
if (strcmp(cmd, "markbad") == 0) { if (strcmp(cmd, "markbad") == 0) {
addr = (ulong)simple_strtoul(argv[2], NULL, 16); argc -= 2;
argv += 2;
int ret = mtd->block_markbad(mtd, addr); if (argc <= 0)
if (ret == 0) { goto usage;
printf("block 0x%08lx successfully marked as bad\n",
(ulong) addr); while (argc > 0) {
return 0; addr = simple_strtoul(*argv, NULL, 16);
if (mtd->block_markbad(mtd, addr)) {
printf("block 0x%08lx NOT marked "
"as bad! ERROR %d\n",
addr, ret);
ret = 1;
} else { } else {
printf("block 0x%08lx NOT marked as bad! ERROR %d\n", printf("block 0x%08lx successfully "
(ulong) addr, ret); "marked as bad\n",
addr);
} }
return 1; --argc;
++argv;
}
return ret;
} }
if (strncmp(cmd, "dump", 4) == 0) { if (strncmp(cmd, "dump", 4) == 0) {
@ -474,7 +485,7 @@ usage:
} }
U_BOOT_CMD( U_BOOT_CMD(
onenand, 6, 1, do_onenand, onenand, CONFIG_SYS_MAXARGS, 1, do_onenand,
"OneNAND sub-system", "OneNAND sub-system",
"info - show available OneNAND devices\n" "info - show available OneNAND devices\n"
"onenand bad - show bad blocks\n" "onenand bad - show bad blocks\n"