From fb3659ac422801ea18f36ef62926df70beeada4c Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 23 Sep 2011 15:43:10 +0200 Subject: NAND: Add nand read.raw and write.raw commands These commands should work around various "hardware" ECC and BCH methods. Signed-off-by: Marek Vasut Cc: Scott Wood Cc: Stefano Babic Cc: Wolfgang Denk Cc: Detlev Zundel [scottwood@freescale.com: s/write the page/access the page/] Signed-off-by: Scott Wood --- common/cmd_nand.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'common') diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 6edca7607f..1a67e4d81f 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -598,6 +598,22 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) .mode = MTD_OOB_RAW }; + if (read) + ret = nand->read_oob(nand, off, &ops); + else + ret = nand->write_oob(nand, off, &ops); + } else if (!strcmp(s, ".raw")) { + /* Raw access */ + mtd_oob_ops_t ops = { + .datbuf = (u8 *)addr, + .oobbuf = ((u8 *)addr) + nand->writesize, + .len = nand->writesize, + .ooblen = nand->oobsize, + .mode = MTD_OOB_RAW + }; + + rwsize = nand->writesize + nand->oobsize; + if (read) ret = nand->read_oob(nand, off, &ops); else @@ -695,6 +711,9 @@ U_BOOT_CMD( "nand write - addr off|partition size\n" " read/write 'size' bytes starting at offset 'off'\n" " to/from memory address 'addr', skipping bad blocks.\n" + "nand read.raw - addr off|partition\n" + "nand write.raw - addr off|partition\n" + " Use read.raw/write.raw to avoid ECC and access the page as-is.\n" #ifdef CONFIG_CMD_NAND_TRIMFFS "nand write.trimffs - addr off|partition size\n" " write 'size' bytes starting at offset 'off' from memory address\n" -- cgit v1.2.1 From 6089981663f2abb065ac852b844215a2ceced65f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 14 Sep 2011 00:20:35 +0200 Subject: NAND: Add -y option to nand scrub command This allows the scrub command to scrub without asking the user if he really wants to scrub the area. Useful in scripts. Signed-off-by: Marek Vasut Cc: Scott Wood Cc: Stefano Babic Cc: Wolfgang Denk Cc: Detlev Zundel Acked-by: Mike Frysinger Signed-off-by: Scott Wood --- common/cmd_nand.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'common') diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 1a67e4d81f..c726bf909b 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -464,10 +464,21 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) nand_erase_options_t opts; /* "clean" at index 2 means request to write cleanmarker */ int clean = argc > 2 && !strcmp("clean", argv[2]); - int o = clean ? 3 : 2; + int scrub_yes = argc > 2 && !strcmp("-y", argv[2]); + int o = (clean || scrub_yes) ? 3 : 2; int scrub = !strncmp(cmd, "scrub", 5); int spread = 0; int args = 2; + const char *scrub_warn = + "Warning: " + "scrub option will erase all factory set bad blocks!\n" + " " + "There is no reliable way to recover them.\n" + " " + "Use this command only for testing purposes if you\n" + " " + "are sure of what you are doing!\n" + "\nReally scrub this NAND flash? \n"; if (cmd[5] != 0) { if (!strcmp(&cmd[5], ".spread")) { @@ -504,19 +515,12 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) opts.spread = spread; if (scrub) { - puts("Warning: " - "scrub option will erase all factory set " - "bad blocks!\n" - " " - "There is no reliable way to recover them.\n" - " " - "Use this command only for testing purposes " - "if you\n" - " " - "are sure of what you are doing!\n" - "\nReally scrub this NAND flash? \n"); - - if (getc() == 'y') { + if (!scrub_yes) + puts(scrub_warn); + + if (scrub_yes) + opts.scrub = 1; + else if (getc() == 'y') { puts("y"); if (getc() == '\r') opts.scrub = 1; @@ -733,7 +737,7 @@ U_BOOT_CMD( "nand erase.chip [clean] - erase entire chip'\n" "nand bad - show bad blocks\n" "nand dump[.oob] off - dump page\n" - "nand scrub off size | scrub.part partition | scrub.chip\n" + "nand scrub [-y] off size | scrub.part partition | scrub.chip\n" " really clean NAND erasing bad blocks (UNSAFE)\n" "nand markbad off [...] - mark bad block(s) at offset (UNSAFE)\n" "nand biterr off - make a bit error at offset (UNSAFE)" -- cgit v1.2.1 From ce80ddc1809193bc450b4d1e104d1ab2f9ee8dd2 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 22 Sep 2011 03:57:26 +0200 Subject: NAND: Make page, erase, oob size available via cmd_nand The "nand info" and "nand device" now set shell/environment variables: nand_writesize ... nand page size nand_oobsize ..... nand oob area size nand_erasesize ... nand erase block size Also, the "nand info" command now displays this info. Signed-off-by: Marek Vasut Cc: Scott Wood Cc: Stefano Babic Cc: Wolfgang Denk Cc: Detlev Zundel [scottwood@freescale.com: removed unnecessary memsets] Signed-off-by: Scott Wood --- common/cmd_nand.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/cmd_nand.c b/common/cmd_nand.c index c726bf909b..3e2edb8aaa 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -362,15 +362,31 @@ usage: #endif -static void nand_print_info(int idx) +static void nand_print_and_set_info(int idx) { nand_info_t *nand = &nand_info[idx]; struct nand_chip *chip = nand->priv; + const int bufsz = 32; + char buf[bufsz]; + printf("Device %d: ", idx); if (chip->numchips > 1) printf("%dx ", chip->numchips); printf("%s, sector size %u KiB\n", nand->name, nand->erasesize >> 10); + printf(" Page size %8d b\n", nand->writesize); + printf(" OOB size %8d b\n", nand->oobsize); + printf(" Erase size %8d b\n", nand->erasesize); + + /* Set geometry info */ + sprintf(buf, "%x", nand->writesize); + setenv("nand_writesize", buf); + + sprintf(buf, "%x", nand->oobsize); + setenv("nand_oobsize", buf); + + sprintf(buf, "%x", nand->erasesize); + setenv("nand_erasesize", buf); } int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) @@ -407,7 +423,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) putc('\n'); for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) { if (nand_info[i].name) - nand_print_info(i); + nand_print_and_set_info(i); } return 0; } @@ -418,7 +434,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE) puts("no devices available\n"); else - nand_print_info(dev); + nand_print_and_set_info(dev); return 0; } -- cgit v1.2.1