V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

make nand dump and nand dump.oob work 

Signed-off-by: William Juul <william.juul@tandberg.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
William Juul 2007-12-14 16:33:45 +01:00 committed by Scott Wood
parent 43ea36fb8f
commit 9ad754fef5
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/cmd_nand.c
View File

@ -38,33 +38,40 @@ int find_dev_and_part(const char *id, struct mtd_device **dev,
u8 *part_num, struct part_info **part); u8 *part_num, struct part_info **part);
#endif #endif
static int nand_dump_oob(nand_info_t *nand, ulong off) static int nand_dump(nand_info_t *nand, ulong off, int only_oob)
{
return 0;
}
static int nand_dump(nand_info_t *nand, ulong off)
{ {
int i; int i;
u_char *buf, *p; u_char *datbuf, *oobbuf, *p;
buf = malloc(nand->writesize + nand->oobsize); datbuf = malloc(nand->writesize + nand->oobsize);
if (!buf) { oobbuf = malloc(nand->oobsize);
if (!datbuf || !oobbuf) {
puts("No memory for page buffer\n"); puts("No memory for page buffer\n");
return 1; return 1;
} }
off &= ~(nand->writesize - 1); off &= ~(nand->writesize - 1);
size_t dummy; size_t dummy;
loff_t addr = (loff_t) off; loff_t addr = (loff_t) off;
i = nand->read(nand, addr, nand->writesize, &dummy, buf); struct mtd_oob_ops ops;
memset(&ops, 0, sizeof(ops));
ops.datbuf = datbuf;
ops.oobbuf = oobbuf; /* must exist, but oob data will be appended to ops.datbuf */
ops.len = nand->writesize;
ops.ooblen = nand->oobsize;
ops.mode = MTD_OOB_RAW;
i = nand->read_oob(nand, addr, &ops);
if (i < 0) { if (i < 0) {
printf("Error (%d) reading page %08lx\n", i, off); printf("Error (%d) reading page %08lx\n", i, off);
free(buf); free(datbuf);
free(oobbuf);
return 1; return 1;
} }
printf("Page %08lx dump:\n", off); printf("Page %08lx dump:\n", off);
i = nand->writesize >> 4; p = buf; i = nand->writesize >> 4;
p = datbuf;
while (i--) { while (i--) {
if (!only_oob)
printf("\t%02x %02x %02x %02x %02x %02x %02x %02x" printf("\t%02x %02x %02x %02x %02x %02x %02x %02x"
" %02x %02x %02x %02x %02x %02x %02x %02x\n", " %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[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],
@ -78,7 +85,8 @@ static int nand_dump(nand_info_t *nand, ulong off)
p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
p += 8; p += 8;
} }
free(buf); free(datbuf);
free(oobbuf);
return 0; return 0;
} }
@ -302,9 +310,9 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
off = (int)simple_strtoul(argv[2], NULL, 16); off = (int)simple_strtoul(argv[2], NULL, 16);
if (s != NULL && strcmp(s, ".oob") == 0) if (s != NULL && strcmp(s, ".oob") == 0)
ret = nand_dump_oob(nand, off); ret = nand_dump(nand, off, 1);
else else
ret = nand_dump(nand, off); ret = nand_dump(nand, off, 0);
return ret == 0 ? 1 : 0; return ret == 0 ? 1 : 0;