common/cmd_nand.c

   1 /*
   2  * Driver for NAND support, Rick Bronson
   3  * borrowed heavily from:
   4  * (c) 1999 Machine Vision Holdings, Inc.
   5  * (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org>
   6  *
   7  * Ported 'dynenv' to 'nand env.oob' command
   8  * (C) 2010 Nanometrics, Inc.
   9  * 'dynenv' -- Dynamic environment offset in NAND OOB
  10  * (C) Copyright 2006-2007 OpenMoko, Inc.
  11  * Added 16-bit nand support
  12  * (C) 2004 Texas Instruments
  13  */
  14
  15 #include <common.h>
  16 #include <linux/mtd/mtd.h>
  17 #include <command.h>
  18 #include <watchdog.h>
  19 #include <malloc.h>
  20 #include <asm/byteorder.h>
  21 #include <jffs2/jffs2.h>
  22 #include <nand.h>
  23
  24 #if defined(CONFIG_CMD_MTDPARTS)
  25
  26 /* partition handling routines */
  27 int mtdparts_init(void);
  28 int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num);
  29 int find_dev_and_part(const char *id, struct mtd_device **dev,
  30                       u8 *part_num, struct part_info **part);
  31 #endif
  32
  33 static int nand_dump(nand_info_t *nand, ulong off, int only_oob)
  34 {
  35         int i;
  36         u_char *datbuf, *oobbuf, *p;
  37
  38         datbuf = malloc(nand->writesize + nand->oobsize);
  39         oobbuf = malloc(nand->oobsize);
  40         if (!datbuf || !oobbuf) {
  41                 puts("No memory for page buffer\n");
  42                 return 1;
  43         }
  44         off &= ~(nand->writesize - 1);
  45         loff_t addr = (loff_t) off;
  46         struct mtd_oob_ops ops;
  47         memset(&ops, 0, sizeof(ops));
  48         ops.datbuf = datbuf;
  49         ops.oobbuf = oobbuf; /* must exist, but oob data will be appended to ops.datbuf */
  50         ops.len = nand->writesize;
  51         ops.ooblen = nand->oobsize;
  52         ops.mode = MTD_OOB_RAW;
  53         i = nand->read_oob(nand, addr, &ops);
  54         if (i < 0) {
  55                 printf("Error (%d) reading page %08lx\n", i, off);
  56                 free(datbuf);
  57                 free(oobbuf);
  58                 return 1;
  59         }
  60         printf("Page %08lx dump:\n", off);
  61         i = nand->writesize >> 4;
  62         p = datbuf;
  63
  64         while (i--) {
  65                 if (!only_oob)
  66                         printf("\t%02x %02x %02x %02x %02x %02x %02x %02x"
  67                                "  %02x %02x %02x %02x %02x %02x %02x %02x\n",
  68                                p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],
  69                                p[8], p[9], p[10], p[11], p[12], p[13], p[14],
  70                                p[15]);
  71                 p += 16;
  72         }
  73         puts("OOB:\n");
  74         i = nand->oobsize >> 3;
  75         while (i--) {
  76                 printf("\t%02x %02x %02x %02x %02x %02x %02x %02x\n",
  77                        p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
  78                 p += 8;
  79         }
  80         free(datbuf);
  81         free(oobbuf);
  82
  83         return 0;
  84 }
  85
  86 /* ------------------------------------------------------------------------- */
  87
  88 static inline int str2long(char *p, ulong *num)
  89 {
  90         char *endptr;
  91
  92         *num = simple_strtoul(p, &endptr, 16);
  93         return (*p != '\0' && *endptr == '\0') ? 1 : 0;
  94 }
  95
  96 static int
  97 arg_off_size(int argc, char * const argv[], nand_info_t *nand, ulong *off, size_t *size)
  98 {
  99         int idx = nand_curr_device;
 100 #if defined(CONFIG_CMD_MTDPARTS)
 101         struct mtd_device *dev;
 102         struct part_info *part;
 103         u8 pnum;
 104
 105         if (argc >= 1 && !(str2long(argv[0], off))) {
 106                 if ((mtdparts_init() == 0) &&
 107                     (find_dev_and_part(argv[0], &dev, &pnum, &part) == 0)) {
 108                         if (dev->id->type != MTD_DEV_TYPE_NAND) {
 109                                 puts("not a NAND device\n");
 110                                 return -1;
 111                         }
 112                         *off = part->offset;
 113                         if (argc >= 2) {
 114                                 if (!(str2long(argv[1], (ulong *)size))) {
 115                                         printf("'%s' is not a number\n", argv[1]);
 116                                         return -1;
 117                                 }
 118                                 if (*size > part->size)
 119                                         *size = part->size;
 120                         } else {
 121                                 *size = part->size;
 122                         }
 123                         idx = dev->id->num;
 124                         *nand = nand_info[idx];
 125                         goto out;
 126                 }
 127         }
 128 #endif
 129
 130         if (argc >= 1) {
 131                 if (!(str2long(argv[0], off))) {
 132                         printf("'%s' is not a number\n", argv[0]);
 133                         return -1;
 134                 }
 135         } else {
 136                 *off = 0;
 137         }
 138
 139         if (argc >= 2) {
 140                 if (!(str2long(argv[1], (ulong *)size))) {
 141                         printf("'%s' is not a number\n", argv[1]);
 142                         return -1;
 143                 }
 144         } else {
 145                 *size = nand->size - *off;
 146         }
 147
 148 #if defined(CONFIG_CMD_MTDPARTS)
 149 out:
 150 #endif
 151         printf("device %d ", idx);
 152         if (*size == nand->size)
 153                 puts("whole chip\n");
 154         else
 155                 printf("offset 0x%lx, size 0x%zx\n", *off, *size);
 156         return 0;
 157 }
 158
 159 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
 160 static void print_status(ulong start, ulong end, ulong erasesize, int status)
 161 {
 162         printf("%08lx - %08lx: %08lx blocks %s%s%s\n",
 163                 start,
 164                 end - 1,
 165                 (end - start) / erasesize,
 166                 ((status & NAND_LOCK_STATUS_TIGHT) ?  "TIGHT " : ""),
 167                 ((status & NAND_LOCK_STATUS_LOCK) ?  "LOCK " : ""),
 168                 ((status & NAND_LOCK_STATUS_UNLOCK) ?  "UNLOCK " : ""));
 169 }
 170
 171 static void do_nand_status(nand_info_t *nand)
 172 {
 173         ulong block_start = 0;
 174         ulong off;
 175         int last_status = -1;
 176
 177         struct nand_chip *nand_chip = nand->priv;
 178         /* check the WP bit */
 179         nand_chip->cmdfunc(nand, NAND_CMD_STATUS, -1, -1);
 180         printf("device is %swrite protected\n",
 181                 (nand_chip->read_byte(nand) & 0x80 ?
 182                 "NOT " : ""));
 183
 184         for (off = 0; off < nand->size; off += nand->erasesize) {
 185                 int s = nand_get_lock_status(nand, off);
 186
 187                 /* print message only if status has changed */
 188                 if (s != last_status && off != 0) {
 189                         print_status(block_start, off, nand->erasesize,
 190                                         last_status);
 191                         block_start = off;
 192                 }
 193                 last_status = s;
 194         }
 195         /* Print the last block info */
 196         print_status(block_start, off, nand->erasesize, last_status);
 197 }
 198 #endif
 199
 200 #ifdef CONFIG_ENV_OFFSET_OOB
 201 unsigned long nand_env_oob_offset;
 202
 203 int do_nand_env_oob(cmd_tbl_t *cmdtp, nand_info_t *nand,
 204                     int argc, char * const argv[])
 205 {
 206         int ret;
 207         uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)];
 208
 209         char *cmd = argv[1];
 210
 211         if (!strcmp(cmd, "get")) {
 212                 ret = get_nand_env_oob(nand, &nand_env_oob_offset);
 213                 if (ret)
 214                         return 1;
 215
 216                 printf("0x%08lx\n", nand_env_oob_offset);
 217         } else if (!strcmp(cmd, "set")) {
 218                 ulong addr;
 219                 size_t dummy_size;
 220                 struct mtd_oob_ops ops;
 221
 222                 if (argc < 3)
 223                         goto usage;
 224
 225                 if (arg_off_size(argc - 2, argv + 2, nand, &addr,
 226                                  &dummy_size) < 0) {
 227                         printf("Offset or partition name expected\n");
 228                         return 1;
 229                 }
 230
 231                 if (nand->oobavail < ENV_OFFSET_SIZE) {
 232                         printf("Insufficient available OOB bytes:\n"
 233                                "%d OOB bytes available but %d required for "
 234                                "env.oob support\n",
 235                                nand->oobavail, ENV_OFFSET_SIZE);
 236                         return 1;
 237                 }
 238
 239                 if ((addr & (nand->erasesize - 1)) != 0) {
 240                         printf("Environment offset must be block-aligned\n");
 241                         return 1;
 242                 }
 243
 244                 ops.datbuf = NULL;
 245                 ops.mode = MTD_OOB_AUTO;
 246                 ops.ooboffs = 0;
 247                 ops.ooblen = ENV_OFFSET_SIZE;
 248                 ops.oobbuf = (void *) oob_buf;
 249
 250                 oob_buf[0] = ENV_OOB_MARKER;
 251                 oob_buf[1] = addr / nand->erasesize;
 252
 253                 ret = nand->write_oob(nand, ENV_OFFSET_SIZE, &ops);
 254                 if (ret) {
 255                         printf("Error writing OOB block 0\n");
 256                         return ret;
 257                 }
 258
 259                 ret = get_nand_env_oob(nand, &nand_env_oob_offset);
 260                 if (ret) {
 261                         printf("Error reading env offset in OOB\n");
 262                         return ret;
 263                 }
 264
 265                 if (addr != nand_env_oob_offset) {
 266                         printf("Verification of env offset in OOB failed: "
 267                                "0x%08lx expected but got 0x%08lx\n",
 268                                addr, nand_env_oob_offset);
 269                         return 1;
 270                 }
 271         } else {
 272                 goto usage;
 273         }
 274
 275         return ret;
 276
 277 usage:
 278         cmd_usage(cmdtp);
 279         return 1;
 280 }
 281
 282 #endif
 283
 284 static void nand_print_info(int idx)
 285 {
 286         nand_info_t *nand = &nand_info[idx];
 287         struct nand_chip *chip = nand->priv;
 288         printf("Device %d: ", idx);
 289         if (chip->numchips > 1)
 290                 printf("%dx ", chip->numchips);
 291         printf("%s, sector size %u KiB\n",
 292                nand->name, nand->erasesize >> 10);
 293 }
 294
 295 int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 296 {
 297         int i, dev, ret = 0;
 298         ulong addr, off;
 299         size_t size;
 300         char *cmd, *s;
 301         nand_info_t *nand;
 302 #ifdef CONFIG_SYS_NAND_QUIET
 303         int quiet = CONFIG_SYS_NAND_QUIET;
 304 #else
 305         int quiet = 0;
 306 #endif
 307         const char *quiet_str = getenv("quiet");
 308
 309         /* at least two arguments please */
 310         if (argc < 2)
 311                 goto usage;
 312
 313         if (quiet_str)
 314                 quiet = simple_strtoul(quiet_str, NULL, 0) != 0;
 315
 316         cmd = argv[1];
 317
 318         if (strcmp(cmd, "info") == 0) {
 319
 320                 putc('\n');
 321                 for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
 322                         if (nand_info[i].name)
 323                                 nand_print_info(i);
 324                 }
 325                 return 0;
 326         }
 327
 328         if (strcmp(cmd, "device") == 0) {
 329
 330                 if (argc < 3) {
 331                         putc('\n');
 332                         if ((nand_curr_device < 0) ||
 333                             (nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE))
 334                                 puts("no devices available\n");
 335                         else
 336                                 nand_print_info(nand_curr_device);
 337                         return 0;
 338                 }
 339                 dev = (int)simple_strtoul(argv[2], NULL, 10);
 340                 if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[dev].name) {
 341                         puts("No such device\n");
 342                         return 1;
 343                 }
 344                 printf("Device %d: %s", dev, nand_info[dev].name);
 345                 puts("... is now current device\n");
 346                 nand_curr_device = dev;
 347
 348 #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
 349                 /*
 350                  * Select the chip in the board/cpu specific driver
 351                  */
 352                 board_nand_select_device(nand_info[dev].priv, dev);
 353 #endif
 354
 355                 return 0;
 356         }
 357
 358         if (strcmp(cmd, "bad") != 0 && strcmp(cmd, "erase") != 0 &&
 359             strncmp(cmd, "dump", 4) != 0 &&
 360             strncmp(cmd, "read", 4) != 0 && strncmp(cmd, "write", 5) != 0 &&
 361             strcmp(cmd, "scrub") != 0 && strcmp(cmd, "markbad") != 0 &&
 362             strcmp(cmd, "biterr") != 0 &&
 363             strcmp(cmd, "lock") != 0 && strcmp(cmd, "unlock") != 0
 364 #ifdef CONFIG_ENV_OFFSET_OOB
 365             && strcmp(cmd, "env.oob") != 0
 366 #endif
 367             )
 368                 goto usage;
 369
 370 #ifdef CONFIG_ENV_OFFSET_OOB
 371         /* this command operates only on the first nand device */
 372         if (strcmp(cmd, "env.oob") == 0) {
 373                 return do_nand_env_oob(cmdtp, &nand_info[0],
 374                                        argc - 1, argv + 1);
 375         }
 376 #endif
 377
 378         /* the following commands operate on the current device */
 379         if (nand_curr_device < 0 || nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE ||
 380             !nand_info[nand_curr_device].name) {
 381                 puts("\nno devices available\n");
 382                 return 1;
 383         }
 384         nand = &nand_info[nand_curr_device];
 385
 386         if (strcmp(cmd, "bad") == 0) {
 387                 printf("\nDevice %d bad blocks:\n", nand_curr_device);
 388                 for (off = 0; off < nand->size; off += nand->erasesize)
 389                         if (nand_block_isbad(nand, off))
 390                                 printf("  %08lx\n", off);
 391                 return 0;
 392         }
 393
 394         /*
 395          * Syntax is:
 396          *   0    1     2       3    4
 397          *   nand erase [clean] [off size]
 398          */
 399         if (strcmp(cmd, "erase") == 0 || strcmp(cmd, "scrub") == 0) {
 400                 nand_erase_options_t opts;
 401                 /* "clean" at index 2 means request to write cleanmarker */
 402                 int clean = argc > 2 && !strcmp("clean", argv[2]);
 403                 int o = clean ? 3 : 2;
 404                 int scrub = !strcmp(cmd, "scrub");
 405
 406                 printf("\nNAND %s: ", scrub ? "scrub" : "erase");
 407                 /* skip first two or three arguments, look for offset and size */
 408                 if (arg_off_size(argc - o, argv + o, nand, &off, &size) != 0)
 409                         return 1;
 410
 411                 memset(&opts, 0, sizeof(opts));
 412                 opts.offset = off;
 413                 opts.length = size;
 414                 opts.jffs2  = clean;
 415                 opts.quiet  = quiet;
 416
 417                 if (scrub) {
 418                         puts("Warning: "
 419                              "scrub option will erase all factory set "
 420                              "bad blocks!\n"
 421                              "         "
 422                              "There is no reliable way to recover them.\n"
 423                              "         "
 424                              "Use this command only for testing purposes "
 425                              "if you\n"
 426                              "         "
 427                              "are sure of what you are doing!\n"
 428                              "\nReally scrub this NAND flash? <y/N>\n");
 429
 430                         if (getc() == 'y') {
 431                                 puts("y");
 432                                 if (getc() == '\r')
 433                                         opts.scrub = 1;
 434                                 else {
 435                                         puts("scrub aborted\n");
 436                                         return -1;
 437                                 }
 438                         } else {
 439                                 puts("scrub aborted\n");
 440                                 return -1;
 441                         }
 442                 }
 443                 ret = nand_erase_opts(nand, &opts);
 444                 printf("%s\n", ret ? "ERROR" : "OK");
 445
 446                 return ret == 0 ? 0 : 1;
 447         }
 448
 449         if (strncmp(cmd, "dump", 4) == 0) {
 450                 if (argc < 3)
 451                         goto usage;
 452
 453                 s = strchr(cmd, '.');
 454                 off = (int)simple_strtoul(argv[2], NULL, 16);
 455
 456                 if (s != NULL && strcmp(s, ".oob") == 0)
 457                         ret = nand_dump(nand, off, 1);
 458                 else
 459                         ret = nand_dump(nand, off, 0);
 460
 461                 return ret == 0 ? 1 : 0;
 462
 463         }
 464
 465         if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) {
 466                 int read;
 467
 468                 if (argc < 4)
 469                         goto usage;
 470
 471                 addr = (ulong)simple_strtoul(argv[2], NULL, 16);
 472
 473                 read = strncmp(cmd, "read", 4) == 0; /* 1 = read, 0 = write */
 474                 printf("\nNAND %s: ", read ? "read" : "write");
 475                 if (arg_off_size(argc - 3, argv + 3, nand, &off, &size) != 0)
 476                         return 1;
 477
 478                 s = strchr(cmd, '.');
 479                 if (!s || !strcmp(s, ".jffs2") ||
 480                     !strcmp(s, ".e") || !strcmp(s, ".i")) {
 481                         if (read)
 482                                 ret = nand_read_skip_bad(nand, off, &size,
 483                                                          (u_char *)addr);
 484                         else
 485                                 ret = nand_write_skip_bad(nand, off, &size,
 486                                                           (u_char *)addr);
 487                 } else if (!strcmp(s, ".oob")) {
 488                         /* out-of-band data */
 489                         mtd_oob_ops_t ops = {
 490                                 .oobbuf = (u8 *)addr,
 491                                 .ooblen = size,
 492                                 .mode = MTD_OOB_RAW
 493                         };
 494
 495                         if (read)
 496                                 ret = nand->read_oob(nand, off, &ops);
 497                         else
 498                                 ret = nand->write_oob(nand, off, &ops);
 499                 } else {
 500                         printf("Unknown nand command suffix '%s'.\n", s);
 501                         return 1;
 502                 }
 503
 504                 printf(" %zu bytes %s: %s\n", size,
 505                        read ? "read" : "written", ret ? "ERROR" : "OK");
 506
 507                 return ret == 0 ? 0 : 1;
 508         }
 509
 510         if (strcmp(cmd, "markbad") == 0) {
 511                 argc -= 2;
 512                 argv += 2;
 513
 514                 if (argc <= 0)
 515                         goto usage;
 516
 517                 while (argc > 0) {
 518                         addr = simple_strtoul(*argv, NULL, 16);
 519
 520                         if (nand->block_markbad(nand, addr)) {
 521                                 printf("block 0x%08lx NOT marked "
 522                                         "as bad! ERROR %d\n",
 523                                         addr, ret);
 524                                 ret = 1;
 525                         } else {
 526                                 printf("block 0x%08lx successfully "
 527                                         "marked as bad\n",
 528                                         addr);
 529                         }
 530                         --argc;
 531                         ++argv;
 532                 }
 533                 return ret;
 534         }
 535
 536         if (strcmp(cmd, "biterr") == 0) {
 537                 /* todo */
 538                 return 1;
 539         }
 540
 541 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
 542         if (strcmp(cmd, "lock") == 0) {
 543                 int tight = 0;
 544                 int status = 0;
 545                 if (argc == 3) {
 546                         if (!strcmp("tight", argv[2]))
 547                                 tight = 1;
 548                         if (!strcmp("status", argv[2]))
 549                                 status = 1;
 550                 }
 551                 if (status) {
 552                         do_nand_status(nand);
 553                 } else {
 554                         if (!nand_lock(nand, tight)) {
 555                                 puts("NAND flash successfully locked\n");
 556                         } else {
 557                                 puts("Error locking NAND flash\n");
 558                                 return 1;
 559                         }
 560                 }
 561                 return 0;
 562         }
 563
 564         if (strcmp(cmd, "unlock") == 0) {
 565                 if (arg_off_size(argc - 2, argv + 2, nand, &off, &size) < 0)
 566                         return 1;
 567
 568                 if (!nand_unlock(nand, off, size)) {
 569                         puts("NAND flash successfully unlocked\n");
 570                 } else {
 571                         puts("Error unlocking NAND flash, "
 572                              "write and erase will probably fail\n");
 573                         return 1;
 574                 }
 575                 return 0;
 576         }
 577 #endif
 578
 579 usage:
 580         cmd_usage(cmdtp);
 581         return 1;
 582 }
 583
 584 U_BOOT_CMD(nand, CONFIG_SYS_MAXARGS, 1, do_nand,
 585         "NAND sub-system",
 586         "info - show available NAND devices\n"
 587         "nand device [dev] - show or set current device\n"
 588         "nand read - addr off|partition size\n"
 589         "nand write - addr off|partition size\n"
 590         "    read/write 'size' bytes starting at offset 'off'\n"
 591         "    to/from memory address 'addr', skipping bad blocks.\n"
 592         "nand erase [clean] [off size] - erase 'size' bytes from\n"
 593         "    offset 'off' (entire device if not specified)\n"
 594         "nand bad - show bad blocks\n"
 595         "nand dump[.oob] off - dump page\n"
 596         "nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n"
 597         "nand markbad off [...] - mark bad block(s) at offset (UNSAFE)\n"
 598         "nand biterr off - make a bit error at offset (UNSAFE)"
 599 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
 600         "\n"
 601         "nand lock [tight] [status]\n"
 602         "    bring nand to lock state or display locked pages\n"
 603         "nand unlock [offset] [size] - unlock section"
 604 #endif
 605 #ifdef CONFIG_ENV_OFFSET_OOB
 606         "\n"
 607         "nand env.oob - environment offset in OOB of block 0 of"
 608         "    first device.\n"
 609         "nand env.oob set off|partition - set enviromnent offset\n"
 610         "nand env.oob get - get environment offset"
 611 #endif
 612 );
 613
 614 static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
 615                            ulong offset, ulong addr, char *cmd)
 616 {
 617         int r;
 618         char *ep, *s;
 619         size_t cnt;
 620         image_header_t *hdr;
 621 #if defined(CONFIG_FIT)
 622         const void *fit_hdr = NULL;
 623 #endif
 624
 625         s = strchr(cmd, '.');
 626         if (s != NULL &&
 627             (strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) {
 628                 printf("Unknown nand load suffix '%s'\n", s);
 629                 show_boot_progress(-53);
 630                 return 1;
 631         }
 632
 633         printf("\nLoading from %s, offset 0x%lx\n", nand->name, offset);
 634
 635         cnt = nand->writesize;
 636         r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
 637         if (r) {
 638                 puts("** Read error\n");
 639                 show_boot_progress (-56);
 640                 return 1;
 641         }
 642         show_boot_progress (56);
 643
 644         switch (genimg_get_format ((void *)addr)) {
 645         case IMAGE_FORMAT_LEGACY:
 646                 hdr = (image_header_t *)addr;
 647
 648                 show_boot_progress (57);
 649                 image_print_contents (hdr);
 650
 651                 cnt = image_get_image_size (hdr);
 652                 break;
 653 #if defined(CONFIG_FIT)
 654         case IMAGE_FORMAT_FIT:
 655                 fit_hdr = (const void *)addr;
 656                 puts ("Fit image detected...\n");
 657
 658                 cnt = fit_get_size (fit_hdr);
 659                 break;
 660 #endif
 661         default:
 662                 show_boot_progress (-57);
 663                 puts ("** Unknown image type\n");
 664                 return 1;
 665         }
 666         show_boot_progress (57);
 667
 668         r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
 669         if (r) {
 670                 puts("** Read error\n");
 671                 show_boot_progress (-58);
 672                 return 1;
 673         }
 674         show_boot_progress (58);
 675
 676 #if defined(CONFIG_FIT)
 677         /* This cannot be done earlier, we need complete FIT image in RAM first */
 678         if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
 679                 if (!fit_check_format (fit_hdr)) {
 680                         show_boot_progress (-150);
 681                         puts ("** Bad FIT image format\n");
 682                         return 1;
 683                 }
 684                 show_boot_progress (151);
 685                 fit_print_contents (fit_hdr);
 686         }
 687 #endif
 688
 689         /* Loading ok, update default load address */
 690
 691         load_addr = addr;
 692
 693         /* Check if we should attempt an auto-start */
 694         if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
 695                 char *local_args[2];
 696                 extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
 697
 698                 local_args[0] = cmd;
 699                 local_args[1] = NULL;
 700
 701                 printf("Automatic boot of image at addr 0x%08lx ...\n", addr);
 702
 703                 do_bootm(cmdtp, 0, 1, local_args);
 704                 return 1;
 705         }
 706         return 0;
 707 }
 708
 709 int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 710 {
 711         char *boot_device = NULL;
 712         int idx;
 713         ulong addr, offset = 0;
 714 #if defined(CONFIG_CMD_MTDPARTS)
 715         struct mtd_device *dev;
 716         struct part_info *part;
 717         u8 pnum;
 718
 719         if (argc >= 2) {
 720                 char *p = (argc == 2) ? argv[1] : argv[2];
 721                 if (!(str2long(p, &addr)) && (mtdparts_init() == 0) &&
 722                     (find_dev_and_part(p, &dev, &pnum, &part) == 0)) {
 723                         if (dev->id->type != MTD_DEV_TYPE_NAND) {
 724                                 puts("Not a NAND device\n");
 725                                 return 1;
 726                         }
 727                         if (argc > 3)
 728                                 goto usage;
 729                         if (argc == 3)
 730                                 addr = simple_strtoul(argv[1], NULL, 16);
 731                         else
 732                                 addr = CONFIG_SYS_LOAD_ADDR;
 733                         return nand_load_image(cmdtp, &nand_info[dev->id->num],
 734                                                part->offset, addr, argv[0]);
 735                 }
 736         }
 737 #endif
 738
 739         show_boot_progress(52);
 740         switch (argc) {
 741         case 1:
 742                 addr = CONFIG_SYS_LOAD_ADDR;
 743                 boot_device = getenv("bootdevice");
 744                 break;
 745         case 2:
 746                 addr = simple_strtoul(argv[1], NULL, 16);
 747                 boot_device = getenv("bootdevice");
 748                 break;
 749         case 3:
 750                 addr = simple_strtoul(argv[1], NULL, 16);
 751                 boot_device = argv[2];
 752                 break;
 753         case 4:
 754                 addr = simple_strtoul(argv[1], NULL, 16);
 755                 boot_device = argv[2];
 756                 offset = simple_strtoul(argv[3], NULL, 16);
 757                 break;
 758         default:
 759 #if defined(CONFIG_CMD_MTDPARTS)
 760 usage:
 761 #endif
 762                 cmd_usage(cmdtp);
 763                 show_boot_progress(-53);
 764                 return 1;
 765         }
 766
 767         show_boot_progress(53);
 768         if (!boot_device) {
 769                 puts("\n** No boot device **\n");
 770                 show_boot_progress(-54);
 771                 return 1;
 772         }
 773         show_boot_progress(54);
 774
 775         idx = simple_strtoul(boot_device, NULL, 16);
 776
 777         if (idx < 0 || idx >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[idx].name) {
 778                 printf("\n** Device %d not available\n", idx);
 779                 show_boot_progress(-55);
 780                 return 1;
 781         }
 782         show_boot_progress(55);
 783
 784         return nand_load_image(cmdtp, &nand_info[idx], offset, addr, argv[0]);
 785 }
 786
 787 U_BOOT_CMD(nboot, 4, 1, do_nandboot,
 788         "boot from NAND device",
 789         "[partition] | [[[loadAddr] dev] offset]"
 790 );