]> git.karo-electronics.de Git - karo-tx-uboot.git/blob - common/cmd_nand.c
Change dead code in "test" cmd to debug output
[karo-tx-uboot.git] / 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  * Copyright 2010, 2012 Freescale Semiconductor
15  * The portions of this file whose copyright is held by Freescale and which
16  * are not considered a derived work of GPL v2-only code may be distributed
17  * and/or modified under the terms of the GNU General Public License as
18  * published by the Free Software Foundation; either version 2 of the
19  * License, or (at your option) any later version.
20  */
21
22 #include <common.h>
23 #include <linux/mtd/mtd.h>
24 #include <command.h>
25 #include <watchdog.h>
26 #include <malloc.h>
27 #include <asm/byteorder.h>
28 #include <jffs2/jffs2.h>
29 #include <nand.h>
30
31 #if defined(CONFIG_CMD_MTDPARTS)
32
33 /* partition handling routines */
34 int mtdparts_init(void);
35 int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num);
36 int find_dev_and_part(const char *id, struct mtd_device **dev,
37                       u8 *part_num, struct part_info **part);
38 #endif
39
40 static int nand_dump(nand_info_t *nand, ulong off, int only_oob, int repeat)
41 {
42         int i;
43         u_char *datbuf, *oobbuf, *p;
44         static loff_t last;
45
46         if (repeat)
47                 off = last + nand->writesize;
48
49         last = off;
50
51         datbuf = memalign(ARCH_DMA_MINALIGN, nand->writesize);
52         oobbuf = memalign(ARCH_DMA_MINALIGN, nand->oobsize);
53         if (!datbuf || !oobbuf) {
54                 puts("No memory for page buffer\n");
55                 return 1;
56         }
57         off &= ~(nand->writesize - 1);
58         loff_t addr = (loff_t) off;
59         struct mtd_oob_ops ops;
60         memset(&ops, 0, sizeof(ops));
61         ops.datbuf = datbuf;
62         ops.oobbuf = oobbuf;
63         ops.len = nand->writesize;
64         ops.ooblen = nand->oobsize;
65         ops.mode = MTD_OOB_RAW;
66         i = nand->read_oob(nand, addr, &ops);
67         if (i < 0) {
68                 printf("Error (%d) reading page %08lx\n", i, off);
69                 free(datbuf);
70                 free(oobbuf);
71                 return 1;
72         }
73         printf("Page %08lx dump:\n", off);
74         i = nand->writesize >> 4;
75         p = datbuf;
76
77         while (i--) {
78                 if (!only_oob)
79                         printf("\t%02x %02x %02x %02x %02x %02x %02x %02x"
80                                "  %02x %02x %02x %02x %02x %02x %02x %02x\n",
81                                p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],
82                                p[8], p[9], p[10], p[11], p[12], p[13], p[14],
83                                p[15]);
84                 p += 16;
85         }
86         puts("OOB:\n");
87         i = nand->oobsize >> 3;
88         p = oobbuf;
89         while (i--) {
90                 printf("\t%02x %02x %02x %02x %02x %02x %02x %02x\n",
91                        p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
92                 p += 8;
93         }
94         free(datbuf);
95         free(oobbuf);
96
97         return 0;
98 }
99
100 /* ------------------------------------------------------------------------- */
101
102 static int set_dev(int dev)
103 {
104         if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
105             !nand_info[dev].name) {
106                 puts("No such device\n");
107                 return -1;
108         }
109
110         if (nand_curr_device == dev)
111                 return 0;
112
113         printf("Device %d: %s", dev, nand_info[dev].name);
114         puts("... is now current device\n");
115         nand_curr_device = dev;
116
117 #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
118         board_nand_select_device(nand_info[dev].priv, dev);
119 #endif
120
121         return 0;
122 }
123
124 static inline int str2off(const char *p, loff_t *num)
125 {
126         char *endptr;
127
128         *num = simple_strtoull(p, &endptr, 16);
129         return *p != '\0' && *endptr == '\0';
130 }
131
132 static inline int str2long(const char *p, ulong *num)
133 {
134         char *endptr;
135
136         *num = simple_strtoul(p, &endptr, 16);
137         return *p != '\0' && *endptr == '\0';
138 }
139
140 static int get_part(const char *partname, int *idx, loff_t *off, loff_t *size)
141 {
142 #ifdef CONFIG_CMD_MTDPARTS
143         struct mtd_device *dev;
144         struct part_info *part;
145         u8 pnum;
146         int ret;
147
148         ret = mtdparts_init();
149         if (ret)
150                 return ret;
151
152         ret = find_dev_and_part(partname, &dev, &pnum, &part);
153         if (ret)
154                 return ret;
155
156         if (dev->id->type != MTD_DEV_TYPE_NAND) {
157                 puts("not a NAND device\n");
158                 return -1;
159         }
160
161         *off = part->offset;
162         *size = part->size;
163         *idx = dev->id->num;
164
165         ret = set_dev(*idx);
166         if (ret)
167                 return ret;
168
169         return 0;
170 #else
171         puts("offset is not a number\n");
172         return -1;
173 #endif
174 }
175
176 static int arg_off(const char *arg, int *idx, loff_t *off, loff_t *maxsize)
177 {
178         if (!str2off(arg, off))
179                 return get_part(arg, idx, off, maxsize);
180
181         if (*off >= nand_info[*idx].size) {
182                 puts("Offset exceeds device limit\n");
183                 return -1;
184         }
185
186         *maxsize = nand_info[*idx].size - *off;
187         return 0;
188 }
189
190 static int arg_off_size(int argc, char *const argv[], int *idx,
191                         loff_t *off, loff_t *size)
192 {
193         int ret;
194         loff_t maxsize = 0;
195
196         if (argc == 0) {
197                 *off = 0;
198                 *size = nand_info[*idx].size;
199                 goto print;
200         }
201
202         ret = arg_off(argv[0], idx, off, &maxsize);
203         if (ret)
204                 return ret;
205
206         if (argc == 1) {
207                 *size = maxsize;
208                 goto print;
209         }
210
211         if (!str2off(argv[1], size)) {
212                 printf("'%s' is not a number\n", argv[1]);
213                 return -1;
214         }
215
216         if (*size > maxsize) {
217                 puts("Size exceeds partition or device limit\n");
218                 return -1;
219         }
220
221 print:
222         printf("device %d ", *idx);
223         if (*size == nand_info[*idx].size)
224                 puts("whole chip\n");
225         else
226                 printf("offset 0x%llx, size 0x%llx\n",
227                        (unsigned long long)*off, (unsigned long long)*size);
228         return 0;
229 }
230
231 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
232 static void print_status(ulong start, ulong end, ulong erasesize, int status)
233 {
234         /*
235          * Micron NAND flash (e.g. MT29F4G08ABADAH4) BLOCK LOCK READ STATUS is
236          * not the same as others.  Instead of bit 1 being lock, it is
237          * #lock_tight. To make the driver support either format, ignore bit 1
238          * and use only bit 0 and bit 2.
239          */
240         printf("%08lx - %08lx: %08lx blocks %s%s%s\n",
241                 start,
242                 end - 1,
243                 (end - start) / erasesize,
244                 ((status & NAND_LOCK_STATUS_TIGHT) ?  "TIGHT " : ""),
245                 (!(status & NAND_LOCK_STATUS_UNLOCK) ?  "LOCK " : ""),
246                 ((status & NAND_LOCK_STATUS_UNLOCK) ?  "UNLOCK " : ""));
247 }
248
249 static void do_nand_status(nand_info_t *nand)
250 {
251         ulong block_start = 0;
252         ulong off;
253         int last_status = -1;
254
255         struct nand_chip *nand_chip = nand->priv;
256         /* check the WP bit */
257         nand_chip->cmdfunc(nand, NAND_CMD_STATUS, -1, -1);
258         printf("device is %swrite protected\n",
259                 (nand_chip->read_byte(nand) & 0x80 ?
260                 "NOT " : ""));
261
262         for (off = 0; off < nand->size; off += nand->erasesize) {
263                 int s = nand_get_lock_status(nand, off);
264
265                 /* print message only if status has changed */
266                 if (s != last_status && off != 0) {
267                         print_status(block_start, off, nand->erasesize,
268                                         last_status);
269                         block_start = off;
270                 }
271                 last_status = s;
272         }
273         /* Print the last block info */
274         print_status(block_start, off, nand->erasesize, last_status);
275 }
276 #endif
277
278 #ifdef CONFIG_ENV_OFFSET_OOB
279 unsigned long nand_env_oob_offset;
280
281 int do_nand_env_oob(cmd_tbl_t *cmdtp, int argc, char *const argv[])
282 {
283         int ret;
284         uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)];
285         nand_info_t *nand = &nand_info[0];
286         char *cmd = argv[1];
287
288         if (CONFIG_SYS_MAX_NAND_DEVICE == 0 || !nand->name) {
289                 puts("no devices available\n");
290                 return 1;
291         }
292
293         set_dev(0);
294
295         if (!strcmp(cmd, "get")) {
296                 ret = get_nand_env_oob(nand, &nand_env_oob_offset);
297                 if (ret)
298                         return 1;
299
300                 printf("0x%08lx\n", nand_env_oob_offset);
301         } else if (!strcmp(cmd, "set")) {
302                 loff_t addr;
303                 loff_t maxsize;
304                 struct mtd_oob_ops ops;
305                 int idx = 0;
306
307                 if (argc < 3)
308                         goto usage;
309
310                 if (arg_off(argv[2], &idx, &addr, &maxsize)) {
311                         puts("Offset or partition name expected\n");
312                         return 1;
313                 }
314
315                 if (idx != 0) {
316                         puts("Partition not on first NAND device\n");
317                         return 1;
318                 }
319
320                 if (nand->oobavail < ENV_OFFSET_SIZE) {
321                         printf("Insufficient available OOB bytes:\n"
322                                "%d OOB bytes available but %d required for "
323                                "env.oob support\n",
324                                nand->oobavail, ENV_OFFSET_SIZE);
325                         return 1;
326                 }
327
328                 if ((addr & (nand->erasesize - 1)) != 0) {
329                         printf("Environment offset must be block-aligned\n");
330                         return 1;
331                 }
332
333                 ops.datbuf = NULL;
334                 ops.mode = MTD_OOB_AUTO;
335                 ops.ooboffs = 0;
336                 ops.ooblen = ENV_OFFSET_SIZE;
337                 ops.oobbuf = (void *) oob_buf;
338
339                 oob_buf[0] = ENV_OOB_MARKER;
340                 oob_buf[1] = addr / nand->erasesize;
341
342                 ret = nand->write_oob(nand, ENV_OFFSET_SIZE, &ops);
343                 if (ret) {
344                         printf("Error writing OOB block 0\n");
345                         return ret;
346                 }
347
348                 ret = get_nand_env_oob(nand, &nand_env_oob_offset);
349                 if (ret) {
350                         printf("Error reading env offset in OOB\n");
351                         return ret;
352                 }
353
354                 if (addr != nand_env_oob_offset) {
355                         printf("Verification of env offset in OOB failed: "
356                                "0x%08llx expected but got 0x%08lx\n",
357                                (unsigned long long)addr, nand_env_oob_offset);
358                         return 1;
359                 }
360         } else {
361                 goto usage;
362         }
363
364         return ret;
365
366 usage:
367         return CMD_RET_USAGE;
368 }
369
370 #endif
371
372 static void nand_print_and_set_info(int idx)
373 {
374         nand_info_t *nand = &nand_info[idx];
375         struct nand_chip *chip = nand->priv;
376         const int bufsz = 32;
377         char buf[bufsz];
378
379         printf("Device %d: ", idx);
380         if (chip->numchips > 1)
381                 printf("%dx ", chip->numchips);
382         printf("%s, sector size %u KiB\n",
383                nand->name, nand->erasesize >> 10);
384         printf("  Page size  %8d b\n", nand->writesize);
385         printf("  OOB size   %8d b\n", nand->oobsize);
386         printf("  Erase size %8d b\n", nand->erasesize);
387
388         /* Set geometry info */
389         sprintf(buf, "%x", nand->writesize);
390         setenv("nand_writesize", buf);
391
392         sprintf(buf, "%x", nand->oobsize);
393         setenv("nand_oobsize", buf);
394
395         sprintf(buf, "%x", nand->erasesize);
396         setenv("nand_erasesize", buf);
397 }
398
399 static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,
400                         int read)
401 {
402         int ret = 0;
403
404         while (count--) {
405                 /* Raw access */
406                 mtd_oob_ops_t ops = {
407                         .datbuf = (u8 *)addr,
408                         .oobbuf = ((u8 *)addr) + nand->writesize,
409                         .len = nand->writesize,
410                         .ooblen = nand->oobsize,
411                         .mode = MTD_OOB_RAW
412                 };
413
414                 if (read)
415                         ret = nand->read_oob(nand, off, &ops);
416                 else
417                         ret = nand->write_oob(nand, off, &ops);
418
419                 if (ret) {
420                         printf("%s: error at offset %llx, ret %d\n",
421                                 __func__, (long long)off, ret);
422                         break;
423                 }
424
425                 addr += nand->writesize + nand->oobsize;
426                 off += nand->writesize;
427         }
428
429         return ret;
430 }
431
432 int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
433 {
434         int i, ret = 0;
435         ulong addr;
436         loff_t off, size;
437         char *cmd, *s;
438         nand_info_t *nand;
439 #ifdef CONFIG_SYS_NAND_QUIET
440         int quiet = CONFIG_SYS_NAND_QUIET;
441 #else
442         int quiet = 0;
443 #endif
444         const char *quiet_str = getenv("quiet");
445         int dev = nand_curr_device;
446         int repeat = flag & CMD_FLAG_REPEAT;
447
448         /* at least two arguments please */
449         if (argc < 2)
450                 goto usage;
451
452         if (quiet_str)
453                 quiet = simple_strtoul(quiet_str, NULL, 0) != 0;
454
455         cmd = argv[1];
456
457         /* Only "dump" is repeatable. */
458         if (repeat && strcmp(cmd, "dump"))
459                 return 0;
460
461         if (strcmp(cmd, "info") == 0) {
462
463                 putc('\n');
464                 for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
465                         if (nand_info[i].name)
466                                 nand_print_and_set_info(i);
467                 }
468                 return 0;
469         }
470
471         if (strcmp(cmd, "device") == 0) {
472                 if (argc < 3) {
473                         putc('\n');
474                         if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE)
475                                 puts("no devices available\n");
476                         else
477                                 nand_print_and_set_info(dev);
478                         return 0;
479                 }
480
481                 dev = (int)simple_strtoul(argv[2], NULL, 10);
482                 set_dev(dev);
483
484                 return 0;
485         }
486
487 #ifdef CONFIG_ENV_OFFSET_OOB
488         /* this command operates only on the first nand device */
489         if (strcmp(cmd, "env.oob") == 0)
490                 return do_nand_env_oob(cmdtp, argc - 1, argv + 1);
491 #endif
492
493         /* The following commands operate on the current device, unless
494          * overridden by a partition specifier.  Note that if somehow the
495          * current device is invalid, it will have to be changed to a valid
496          * one before these commands can run, even if a partition specifier
497          * for another device is to be used.
498          */
499         if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
500             !nand_info[dev].name) {
501                 puts("\nno devices available\n");
502                 return 1;
503         }
504         nand = &nand_info[dev];
505
506         if (strcmp(cmd, "bad") == 0) {
507                 printf("\nDevice %d bad blocks:\n", dev);
508                 for (off = 0; off < nand->size; off += nand->erasesize)
509                         if (nand_block_isbad(nand, off))
510                                 printf("  %08llx\n", (unsigned long long)off);
511                 return 0;
512         }
513
514         /*
515          * Syntax is:
516          *   0    1     2       3    4
517          *   nand erase [clean] [off size]
518          */
519         if (strncmp(cmd, "erase", 5) == 0 || strncmp(cmd, "scrub", 5) == 0) {
520                 nand_erase_options_t opts;
521                 /* "clean" at index 2 means request to write cleanmarker */
522                 int clean = argc > 2 && !strcmp("clean", argv[2]);
523                 int scrub_yes = argc > 2 && !strcmp("-y", argv[2]);
524                 int o = (clean || scrub_yes) ? 3 : 2;
525                 int scrub = !strncmp(cmd, "scrub", 5);
526                 int spread = 0;
527                 int args = 2;
528                 const char *scrub_warn =
529                         "Warning: "
530                         "scrub option will erase all factory set bad blocks!\n"
531                         "         "
532                         "There is no reliable way to recover them.\n"
533                         "         "
534                         "Use this command only for testing purposes if you\n"
535                         "         "
536                         "are sure of what you are doing!\n"
537                         "\nReally scrub this NAND flash? <y/N>\n";
538
539                 if (cmd[5] != 0) {
540                         if (!strcmp(&cmd[5], ".spread")) {
541                                 spread = 1;
542                         } else if (!strcmp(&cmd[5], ".part")) {
543                                 args = 1;
544                         } else if (!strcmp(&cmd[5], ".chip")) {
545                                 args = 0;
546                         } else {
547                                 goto usage;
548                         }
549                 }
550
551                 /*
552                  * Don't allow missing arguments to cause full chip/partition
553                  * erases -- easy to do accidentally, e.g. with a misspelled
554                  * variable name.
555                  */
556                 if (argc != o + args)
557                         goto usage;
558
559                 printf("\nNAND %s: ", cmd);
560                 /* skip first two or three arguments, look for offset and size */
561                 if (arg_off_size(argc - o, argv + o, &dev, &off, &size) != 0)
562                         return 1;
563
564                 nand = &nand_info[dev];
565
566                 memset(&opts, 0, sizeof(opts));
567                 opts.offset = off;
568                 opts.length = size;
569                 opts.jffs2  = clean;
570                 opts.quiet  = quiet;
571                 opts.spread = spread;
572
573                 if (scrub) {
574                         if (!scrub_yes)
575                                 puts(scrub_warn);
576
577                         if (scrub_yes)
578                                 opts.scrub = 1;
579                         else if (getc() == 'y') {
580                                 puts("y");
581                                 if (getc() == '\r')
582                                         opts.scrub = 1;
583                                 else {
584                                         puts("scrub aborted\n");
585                                         return -1;
586                                 }
587                         } else {
588                                 puts("scrub aborted\n");
589                                 return -1;
590                         }
591                 }
592                 ret = nand_erase_opts(nand, &opts);
593                 printf("%s\n", ret ? "ERROR" : "OK");
594
595                 return ret == 0 ? 0 : 1;
596         }
597
598         if (strncmp(cmd, "dump", 4) == 0) {
599                 if (argc < 3)
600                         goto usage;
601
602                 off = (int)simple_strtoul(argv[2], NULL, 16);
603                 ret = nand_dump(nand, off, !strcmp(&cmd[4], ".oob"), repeat);
604
605                 return ret == 0 ? 1 : 0;
606         }
607
608         if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) {
609                 size_t rwsize;
610                 ulong pagecount = 1;
611                 int read;
612                 int raw;
613
614                 if (argc < 4)
615                         goto usage;
616
617                 addr = (ulong)simple_strtoul(argv[2], NULL, 16);
618
619                 read = strncmp(cmd, "read", 4) == 0; /* 1 = read, 0 = write */
620                 printf("\nNAND %s: ", read ? "read" : "write");
621
622                 nand = &nand_info[dev];
623
624                 s = strchr(cmd, '.');
625
626                 if (s && !strcmp(s, ".raw")) {
627                         raw = 1;
628
629                         if (arg_off(argv[3], &dev, &off, &size))
630                                 return 1;
631
632                         if (argc > 4 && !str2long(argv[4], &pagecount)) {
633                                 printf("'%s' is not a number\n", argv[4]);
634                                 return 1;
635                         }
636
637                         if (pagecount * nand->writesize > size) {
638                                 puts("Size exceeds partition or device limit\n");
639                                 return -1;
640                         }
641
642                         rwsize = pagecount * (nand->writesize + nand->oobsize);
643                 } else {
644                         if (arg_off_size(argc - 3, argv + 3, &dev,
645                                                 &off, &size) != 0)
646                                 return 1;
647
648                         rwsize = size;
649                 }
650
651                 if (!s || !strcmp(s, ".jffs2") ||
652                     !strcmp(s, ".e") || !strcmp(s, ".i")) {
653                         if (read)
654                                 ret = nand_read_skip_bad(nand, off, &rwsize,
655                                                          (u_char *)addr);
656                         else
657                                 ret = nand_write_skip_bad(nand, off, &rwsize,
658                                                           (u_char *)addr, 0);
659 #ifdef CONFIG_CMD_NAND_TRIMFFS
660                 } else if (!strcmp(s, ".trimffs")) {
661                         if (read) {
662                                 printf("Unknown nand command suffix '%s'\n", s);
663                                 return 1;
664                         }
665                         ret = nand_write_skip_bad(nand, off, &rwsize,
666                                                 (u_char *)addr,
667                                                 WITH_DROP_FFS);
668 #endif
669 #ifdef CONFIG_CMD_NAND_YAFFS
670                 } else if (!strcmp(s, ".yaffs")) {
671                         if (read) {
672                                 printf("Unknown nand command suffix '%s'.\n", s);
673                                 return 1;
674                         }
675                         ret = nand_write_skip_bad(nand, off, &rwsize,
676                                                 (u_char *)addr,
677                                                 WITH_INLINE_OOB);
678 #endif
679                 } else if (!strcmp(s, ".oob")) {
680                         /* out-of-band data */
681                         mtd_oob_ops_t ops = {
682                                 .oobbuf = (u8 *)addr,
683                                 .ooblen = rwsize,
684                                 .mode = MTD_OOB_RAW
685                         };
686
687                         if (read)
688                                 ret = nand->read_oob(nand, off, &ops);
689                         else
690                                 ret = nand->write_oob(nand, off, &ops);
691                 } else if (raw) {
692                         ret = raw_access(nand, addr, off, pagecount, read);
693                 } else {
694                         printf("Unknown nand command suffix '%s'.\n", s);
695                         return 1;
696                 }
697
698                 printf(" %zu bytes %s: %s\n", rwsize,
699                        read ? "read" : "written", ret ? "ERROR" : "OK");
700
701                 return ret == 0 ? 0 : 1;
702         }
703
704         if (strcmp(cmd, "markbad") == 0) {
705                 argc -= 2;
706                 argv += 2;
707
708                 if (argc <= 0)
709                         goto usage;
710
711                 while (argc > 0) {
712                         addr = simple_strtoul(*argv, NULL, 16);
713
714                         if (nand->block_markbad(nand, addr)) {
715                                 printf("block 0x%08lx NOT marked "
716                                         "as bad! ERROR %d\n",
717                                         addr, ret);
718                                 ret = 1;
719                         } else {
720                                 printf("block 0x%08lx successfully "
721                                         "marked as bad\n",
722                                         addr);
723                         }
724                         --argc;
725                         ++argv;
726                 }
727                 return ret;
728         }
729
730         if (strcmp(cmd, "biterr") == 0) {
731                 /* todo */
732                 return 1;
733         }
734
735 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
736         if (strcmp(cmd, "lock") == 0) {
737                 int tight = 0;
738                 int status = 0;
739                 if (argc == 3) {
740                         if (!strcmp("tight", argv[2]))
741                                 tight = 1;
742                         if (!strcmp("status", argv[2]))
743                                 status = 1;
744                 }
745                 if (status) {
746                         do_nand_status(nand);
747                 } else {
748                         if (!nand_lock(nand, tight)) {
749                                 puts("NAND flash successfully locked\n");
750                         } else {
751                                 puts("Error locking NAND flash\n");
752                                 return 1;
753                         }
754                 }
755                 return 0;
756         }
757
758         if (strncmp(cmd, "unlock", 5) == 0) {
759                 int allexcept = 0;
760
761                 s = strchr(cmd, '.');
762
763                 if (s && !strcmp(s, ".allexcept"))
764                         allexcept = 1;
765
766                 if (arg_off_size(argc - 2, argv + 2, &dev, &off, &size) < 0)
767                         return 1;
768
769                 if (!nand_unlock(&nand_info[dev], off, size, allexcept)) {
770                         puts("NAND flash successfully unlocked\n");
771                 } else {
772                         puts("Error unlocking NAND flash, "
773                              "write and erase will probably fail\n");
774                         return 1;
775                 }
776                 return 0;
777         }
778 #endif
779
780 usage:
781         return CMD_RET_USAGE;
782 }
783
784 U_BOOT_CMD(
785         nand, CONFIG_SYS_MAXARGS, 1, do_nand,
786         "NAND sub-system",
787         "info - show available NAND devices\n"
788         "nand device [dev] - show or set current device\n"
789         "nand read - addr off|partition size\n"
790         "nand write - addr off|partition size\n"
791         "    read/write 'size' bytes starting at offset 'off'\n"
792         "    to/from memory address 'addr', skipping bad blocks.\n"
793         "nand read.raw - addr off|partition [count]\n"
794         "nand write.raw - addr off|partition [count]\n"
795         "    Use read.raw/write.raw to avoid ECC and access the flash as-is.\n"
796 #ifdef CONFIG_CMD_NAND_TRIMFFS
797         "nand write.trimffs - addr off|partition size\n"
798         "    write 'size' bytes starting at offset 'off' from memory address\n"
799         "    'addr', skipping bad blocks and dropping any pages at the end\n"
800         "    of eraseblocks that contain only 0xFF\n"
801 #endif
802 #ifdef CONFIG_CMD_NAND_YAFFS
803         "nand write.yaffs - addr off|partition size\n"
804         "    write 'size' bytes starting at offset 'off' with yaffs format\n"
805         "    from memory address 'addr', skipping bad blocks.\n"
806 #endif
807         "nand erase[.spread] [clean] off size - erase 'size' bytes "
808         "from offset 'off'\n"
809         "    With '.spread', erase enough for given file size, otherwise,\n"
810         "    'size' includes skipped bad blocks.\n"
811         "nand erase.part [clean] partition - erase entire mtd partition'\n"
812         "nand erase.chip [clean] - erase entire chip'\n"
813         "nand bad - show bad blocks\n"
814         "nand dump[.oob] off - dump page\n"
815         "nand scrub [-y] off size | scrub.part partition | scrub.chip\n"
816         "    really clean NAND erasing bad blocks (UNSAFE)\n"
817         "nand markbad off [...] - mark bad block(s) at offset (UNSAFE)\n"
818         "nand biterr off - make a bit error at offset (UNSAFE)"
819 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
820         "\n"
821         "nand lock [tight] [status]\n"
822         "    bring nand to lock state or display locked pages\n"
823         "nand unlock[.allexcept] [offset] [size] - unlock section"
824 #endif
825 #ifdef CONFIG_ENV_OFFSET_OOB
826         "\n"
827         "nand env.oob - environment offset in OOB of block 0 of"
828         "    first device.\n"
829         "nand env.oob set off|partition - set enviromnent offset\n"
830         "nand env.oob get - get environment offset"
831 #endif
832 );
833
834 static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
835                            ulong offset, ulong addr, char *cmd)
836 {
837         int r;
838         char *s;
839         size_t cnt;
840         image_header_t *hdr;
841 #if defined(CONFIG_FIT)
842         const void *fit_hdr = NULL;
843 #endif
844
845         s = strchr(cmd, '.');
846         if (s != NULL &&
847             (strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) {
848                 printf("Unknown nand load suffix '%s'\n", s);
849                 bootstage_error(BOOTSTAGE_ID_NAND_SUFFIX);
850                 return 1;
851         }
852
853         printf("\nLoading from %s, offset 0x%lx\n", nand->name, offset);
854
855         cnt = nand->writesize;
856         r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
857         if (r) {
858                 puts("** Read error\n");
859                 bootstage_error(BOOTSTAGE_ID_NAND_HDR_READ);
860                 return 1;
861         }
862         bootstage_mark(BOOTSTAGE_ID_NAND_HDR_READ);
863
864         switch (genimg_get_format ((void *)addr)) {
865         case IMAGE_FORMAT_LEGACY:
866                 hdr = (image_header_t *)addr;
867
868                 bootstage_mark(BOOTSTAGE_ID_NAND_TYPE);
869                 image_print_contents (hdr);
870
871                 cnt = image_get_image_size (hdr);
872                 break;
873 #if defined(CONFIG_FIT)
874         case IMAGE_FORMAT_FIT:
875                 fit_hdr = (const void *)addr;
876                 puts ("Fit image detected...\n");
877
878                 cnt = fit_get_size (fit_hdr);
879                 break;
880 #endif
881         default:
882                 bootstage_error(BOOTSTAGE_ID_NAND_TYPE);
883                 puts ("** Unknown image type\n");
884                 return 1;
885         }
886         bootstage_mark(BOOTSTAGE_ID_NAND_TYPE);
887
888         r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
889         if (r) {
890                 puts("** Read error\n");
891                 bootstage_error(BOOTSTAGE_ID_NAND_READ);
892                 return 1;
893         }
894         bootstage_mark(BOOTSTAGE_ID_NAND_READ);
895
896 #if defined(CONFIG_FIT)
897         /* This cannot be done earlier, we need complete FIT image in RAM first */
898         if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
899                 if (!fit_check_format (fit_hdr)) {
900                         bootstage_error(BOOTSTAGE_ID_NAND_FIT_READ);
901                         puts ("** Bad FIT image format\n");
902                         return 1;
903                 }
904                 bootstage_mark(BOOTSTAGE_ID_NAND_FIT_READ_OK);
905                 fit_print_contents (fit_hdr);
906         }
907 #endif
908
909         /* Loading ok, update default load address */
910
911         load_addr = addr;
912
913         return bootm_maybe_autostart(cmdtp, cmd);
914 }
915
916 int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
917 {
918         char *boot_device = NULL;
919         int idx;
920         ulong addr, offset = 0;
921 #if defined(CONFIG_CMD_MTDPARTS)
922         struct mtd_device *dev;
923         struct part_info *part;
924         u8 pnum;
925
926         if (argc >= 2) {
927                 char *p = (argc == 2) ? argv[1] : argv[2];
928                 if (!(str2long(p, &addr)) && (mtdparts_init() == 0) &&
929                     (find_dev_and_part(p, &dev, &pnum, &part) == 0)) {
930                         if (dev->id->type != MTD_DEV_TYPE_NAND) {
931                                 puts("Not a NAND device\n");
932                                 return 1;
933                         }
934                         if (argc > 3)
935                                 goto usage;
936                         if (argc == 3)
937                                 addr = simple_strtoul(argv[1], NULL, 16);
938                         else
939                                 addr = CONFIG_SYS_LOAD_ADDR;
940                         return nand_load_image(cmdtp, &nand_info[dev->id->num],
941                                                part->offset, addr, argv[0]);
942                 }
943         }
944 #endif
945
946         bootstage_mark(BOOTSTAGE_ID_NAND_PART);
947         switch (argc) {
948         case 1:
949                 addr = CONFIG_SYS_LOAD_ADDR;
950                 boot_device = getenv("bootdevice");
951                 break;
952         case 2:
953                 addr = simple_strtoul(argv[1], NULL, 16);
954                 boot_device = getenv("bootdevice");
955                 break;
956         case 3:
957                 addr = simple_strtoul(argv[1], NULL, 16);
958                 boot_device = argv[2];
959                 break;
960         case 4:
961                 addr = simple_strtoul(argv[1], NULL, 16);
962                 boot_device = argv[2];
963                 offset = simple_strtoul(argv[3], NULL, 16);
964                 break;
965         default:
966 #if defined(CONFIG_CMD_MTDPARTS)
967 usage:
968 #endif
969                 bootstage_error(BOOTSTAGE_ID_NAND_SUFFIX);
970                 return CMD_RET_USAGE;
971         }
972         bootstage_mark(BOOTSTAGE_ID_NAND_SUFFIX);
973
974         if (!boot_device) {
975                 puts("\n** No boot device **\n");
976                 bootstage_error(BOOTSTAGE_ID_NAND_BOOT_DEVICE);
977                 return 1;
978         }
979         bootstage_mark(BOOTSTAGE_ID_NAND_BOOT_DEVICE);
980
981         idx = simple_strtoul(boot_device, NULL, 16);
982
983         if (idx < 0 || idx >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[idx].name) {
984                 printf("\n** Device %d not available\n", idx);
985                 bootstage_error(BOOTSTAGE_ID_NAND_AVAILABLE);
986                 return 1;
987         }
988         bootstage_mark(BOOTSTAGE_ID_NAND_AVAILABLE);
989
990         return nand_load_image(cmdtp, &nand_info[idx], offset, addr, argv[0]);
991 }
992
993 U_BOOT_CMD(nboot, 4, 1, do_nandboot,
994         "boot from NAND device",
995         "[partition] | [[[loadAddr] dev] offset]"
996 );