there are 2 bugs in the code of nand command "nand lock status" (function do_nand() in common/cmd_nand.c): 1. "last_status" defined but never step forward. 2. the last page never be printed the following patch fixes them.
Signed-off-by: conke.hu@gmail.com ---------------------------------------- diff --git a/common/cmd_nand.c b/common/cmd_nand.c index cb62661..7e00c97 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -388,7 +388,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) if (status) { ulong block_start = 0; ulong off; - int last_status = -1; + int last_status;
struct nand_chip *nand_chip = nand->priv; /* check the WP bit */ @@ -396,16 +396,15 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) printf("device is %swrite protected\n", (nand_chip->read_byte(nand) & 0x80 ? "NOT " : "" ) ); - - for (off = 0; off < nand->size; off += nand->oobblock) { - int s = nand_get_lock_status(nand, off); + + last_status = nand_get_lock_status(nand, 0); + for (off = nand->oobblock; off < nand->size; off += nand->oobblock) { + int cur_status = nand_get_lock_status(nand, off);
/* print message only if status has changed * or at end of chip */ - if (off == nand->size - nand->oobblock - || (s != last_status && off != 0)) { - + if (cur_status != last_status) { printf("%08x - %08x: %8d pages %s%s%s\n", block_start, off-1, @@ -413,10 +412,20 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) ((last_status & NAND_LOCK_STATUS_TIGHT) ? "TIGHT " : ""), ((last_status & NAND_LOCK_STATUS_LOCK) ? "LOCK " : ""), ((last_status & NAND_LOCK_STATUS_UNLOCK) ? "UNLOCK " : "")); + + last_status = cur_status; + block_start = off; } + } + + printf("%08x - %08x: %8d pages %s%s%s\n", + block_start, + off-1, + (off-block_start)/nand->oobblock, + ((last_status & NAND_LOCK_STATUS_TIGHT) ? "TIGHT " : ""), + ((last_status & NAND_LOCK_STATUS_LOCK) ? "LOCK " : ""), + ((last_status & NAND_LOCK_STATUS_UNLOCK) ? "UNLOCK " : ""));
- last_status = s; - } } else { if (!nand_lock(nand, tight)) { puts("NAND flash successfully locked\n");