]> git.kernelconcepts.de Git - karo-tx-uboot.git/blob - common/cmd_nand.c
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
[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         char buf[32];
377
378         printf("Device %d: ", idx);
379         if (chip->numchips > 1)
380                 printf("%dx ", chip->numchips);
381         printf("%s, sector size %u KiB\n",
382                nand->name, nand->erasesize >> 10);
383         printf("  Page size  %8d b\n", nand->writesize);
384         printf("  OOB size   %8d b\n", nand->oobsize);
385         printf("  Erase size %8d b\n", nand->erasesize);
386
387         /* Set geometry info */
388         sprintf(buf, "%x", nand->writesize);
389         setenv("nand_writesize", buf);
390
391         sprintf(buf, "%x", nand->oobsize);
392         setenv("nand_oobsize", buf);
393
394         sprintf(buf, "%x", nand->erasesize);
395         setenv("nand_erasesize", buf);
396 }
397
398 static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,
399                         int read)
400 {
401         int ret = 0;
402
403         while (count--) {
404                 /* Raw access */
405                 mtd_oob_ops_t ops = {
406                         .datbuf = (u8 *)addr,
407                         .oobbuf = ((u8 *)addr) + nand->writesize,
408                         .len = nand->writesize,
409                         .ooblen = nand->oobsize,
410                         .mode = MTD_OOB_RAW
411                 };
412
413                 if (read)
414                         ret = nand->read_oob(nand, off, &ops);
415                 else
416                         ret = nand->write_oob(nand, off, &ops);
417
418                 if (ret) {
419                         printf("%s: error at offset %llx, ret %d\n",
420                                 __func__, (long long)off, ret);
421                         break;
422                 }
423
424                 addr += nand->writesize + nand->oobsize;
425                 off += nand->writesize;
426         }
427
428         return ret;
429 }
430
431 static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
432 {
433         int i, ret = 0;
434         ulong addr;
435         loff_t off, size;
436         char *cmd, *s;
437         nand_info_t *nand;
438 #ifdef CONFIG_SYS_NAND_QUIET
439         int quiet = CONFIG_SYS_NAND_QUIET;
440 #else
441         int quiet = 0;
442 #endif
443         const char *quiet_str = getenv("quiet");
444         int dev = nand_curr_device;
445         int repeat = flag & CMD_FLAG_REPEAT;
446
447         /* at least two arguments please */
448         if (argc < 2)
449                 goto usage;
450
451         if (quiet_str)
452                 quiet = simple_strtoul(quiet_str, NULL, 0) != 0;
453
454         cmd = argv[1];
455
456         /* Only "dump" is repeatable. */
457         if (repeat && strcmp(cmd, "dump"))
458                 return 0;
459
460         if (strcmp(cmd, "info") == 0) {
461
462                 putc('\n');
463                 for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
464                         if (nand_info[i].name)
465                                 nand_print_and_set_info(i);
466                 }
467                 return 0;
468         }
469
470         if (strcmp(cmd, "device") == 0) {
471                 if (argc < 3) {
472                         putc('\n');
473                         if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE)
474                                 puts("no devices available\n");
475                         else
476                                 nand_print_and_set_info(dev);
477                         return 0;
478                 }
479
480                 dev = (int)simple_strtoul(argv[2], NULL, 10);
481                 set_dev(dev);
482
483                 return 0;
484         }
485
486 #ifdef CONFIG_ENV_OFFSET_OOB
487         /* this command operates only on the first nand device */
488         if (strcmp(cmd, "env.oob") == 0)
489                 return do_nand_env_oob(cmdtp, argc - 1, argv + 1);
490 #endif
491
492         /* The following commands operate on the current device, unless
493          * overridden by a partition specifier.  Note that if somehow the
494          * current device is invalid, it will have to be changed to a valid
495          * one before these commands can run, even if a partition specifier
496          * for another device is to be used.
497          */
498         if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
499             !nand_info[dev].name) {
500                 puts("\nno devices available\n");
501                 return 1;
502         }
503         nand = &nand_info[dev];
504
505         if (strcmp(cmd, "bad") == 0) {
506                 printf("\nDevice %d bad blocks:\n", dev);
507                 for (off = 0; off < nand->size; off += nand->erasesize)
508                         if (nand_block_isbad(nand, off))
509                                 printf("  %08llx\n", (unsigned long long)off);
510                 return 0;
511         }
512
513         /*
514          * Syntax is:
515          *   0    1     2       3    4
516          *   nand erase [clean] [off size]
517          */
518         if (strncmp(cmd, "erase", 5) == 0 || strncmp(cmd, "scrub", 5) == 0) {
519                 nand_erase_options_t opts;
520                 /* "clean" at index 2 means request to write cleanmarker */
521                 int clean = argc > 2 && !strcmp("clean", argv[2]);
522                 int scrub_yes = argc > 2 && !strcmp("-y", argv[2]);
523                 int o = (clean || scrub_yes) ? 3 : 2;
524                 int scrub = !strncmp(cmd, "scrub", 5);
525                 int spread = 0;
526                 int args = 2;
527                 const char *scrub_warn =
528                         "Warning: "
529                         "scrub option will erase all factory set bad blocks!\n"
530                         "         "
531                         "There is no reliable way to recover them.\n"
532                         "         "
533                         "Use this command only for testing purposes if you\n"
534                         "         "
535                         "are sure of what you are doing!\n"
536                         "\nReally scrub this NAND flash? <y/N>\n";
537
538                 if (cmd[5] != 0) {
539                         if (!strcmp(&cmd[5], ".spread")) {
540                                 spread = 1;
541                         } else if (!strcmp(&cmd[5], ".part")) {
542                                 args = 1;
543                         } else if (!strcmp(&cmd[5], ".chip")) {
544                                 args = 0;
545                         } else {
546                                 goto usage;
547                         }
548                 }
549
550                 /*
551                  * Don't allow missing arguments to cause full chip/partition
552                  * erases -- easy to do accidentally, e.g. with a misspelled
553                  * variable name.
554                  */
555                 if (argc != o + args)
556                         goto usage;
557
558                 printf("\nNAND %s: ", cmd);
559                 /* skip first two or three arguments, look for offset and size */
560                 if (arg_off_size(argc - o, argv + o, &dev, &off, &size) != 0)
561                         return 1;
562
563                 nand = &nand_info[dev];
564
565                 memset(&opts, 0, sizeof(opts));
566                 opts.offset = off;
567                 opts.length = size;
568                 opts.jffs2  = clean;
569                 opts.quiet  = quiet;
570                 opts.spread = spread;
571
572                 if (scrub) {
573                         if (!scrub_yes)
574                                 puts(scrub_warn);
575
576                         if (scrub_yes)
577                                 opts.scrub = 1;
578                         else if (getc() == 'y') {
579                                 puts("y");
580                                 if (getc() == '\r')
581                                         opts.scrub = 1;
582                                 else {
583                                         puts("scrub aborted\n");
584                                         return -1;
585                                 }
586                         } else {
587                                 puts("scrub aborted\n");
588                                 return -1;
589                         }
590                 }
591                 ret = nand_erase_opts(nand, &opts);
592                 printf("%s\n", ret ? "ERROR" : "OK");
593
594                 return ret == 0 ? 0 : 1;
595         }
596
597         if (strncmp(cmd, "dump", 4) == 0) {
598                 if (argc < 3)
599                         goto usage;
600
601                 off = (int)simple_strtoul(argv[2], NULL, 16);
602                 ret = nand_dump(nand, off, !strcmp(&cmd[4], ".oob"), repeat);
603
604                 return ret == 0 ? 1 : 0;
605         }
606
607         if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) {
608                 size_t rwsize;
609                 ulong pagecount = 1;
610                 int read;
611                 int raw;
612
613                 if (argc < 4)
614                         goto usage;
615
616                 addr = (ulong)simple_strtoul(argv[2], NULL, 16);
617
618                 read = strncmp(cmd, "read", 4) == 0; /* 1 = read, 0 = write */
619                 printf("\nNAND %s: ", read ? "read" : "write");
620
621                 nand = &nand_info[dev];
622
623                 s = strchr(cmd, '.');
624
625                 if (s && !strcmp(s, ".raw")) {
626                         raw = 1;
627
628                         if (arg_off(argv[3], &dev, &off, &size))
629                                 return 1;
630
631                         if (argc > 4 && !str2long(argv[4], &pagecount)) {
632                                 printf("'%s' is not a number\n", argv[4]);
633                                 return 1;
634                         }
635
636                         if (pagecount * nand->writesize > size) {
637                                 puts("Size exceeds partition or device limit\n");
638                                 return -1;
639                         }
640
641                         rwsize = pagecount * (nand->writesize + nand->oobsize);
642                 } else {
643                         if (arg_off_size(argc - 3, argv + 3, &dev,
644                                                 &off, &size) != 0)
645                                 return 1;
646
647                         rwsize = size;
648                 }
649
650                 if (!s || !strcmp(s, ".jffs2") ||
651                     !strcmp(s, ".e") || !strcmp(s, ".i")) {
652                         if (read)
653                                 ret = nand_read_skip_bad(nand, off, &rwsize,
654                                                          (u_char *)addr);
655                         else
656                                 ret = nand_write_skip_bad(nand, off, &rwsize,
657                                                           (u_char *)addr, 0);
658 #ifdef CONFIG_CMD_NAND_TRIMFFS
659                 } else if (!strcmp(s, ".trimffs")) {
660                         if (read) {
661                                 printf("Unknown nand command suffix '%s'\n", s);
662                                 return 1;
663                         }
664                         ret = nand_write_skip_bad(nand, off, &rwsize,
665                                                 (u_char *)addr,
666                                                 WITH_DROP_FFS);
667 #endif
668 #ifdef CONFIG_CMD_NAND_YAFFS
669                 } else if (!strcmp(s, ".yaffs")) {
670                         if (read) {
671                                 printf("Unknown nand command suffix '%s'.\n", s);
672                                 return 1;
673                         }
674                         ret = nand_write_skip_bad(nand, off, &rwsize,
675                                                 (u_char *)addr,
676                                                 WITH_INLINE_OOB);
677 #endif
678                 } else if (!strcmp(s, ".oob")) {
679                         /* out-of-band data */
680                         mtd_oob_ops_t ops = {
681                                 .oobbuf = (u8 *)addr,
682                                 .ooblen = rwsize,
683                                 .mode = MTD_OOB_RAW
684                         };
685
686                         if (read)
687                                 ret = nand->read_oob(nand, off, &ops);
688                         else
689                                 ret = nand->write_oob(nand, off, &ops);
690                 } else if (raw) {
691                         ret = raw_access(nand, addr, off, pagecount, read);
692                 } else {
693                         printf("Unknown nand command suffix '%s'.\n", s);
694                         return 1;
695                 }
696
697                 printf(" %zu bytes %s: %s\n", rwsize,
698                        read ? "read" : "written", ret ? "ERROR" : "OK");
699
700                 return ret == 0 ? 0 : 1;
701         }
702
703 #ifdef CONFIG_CMD_NAND_TORTURE
704         if (strcmp(cmd, "torture") == 0) {
705                 if (argc < 3)
706                         goto usage;
707
708                 if (!str2off(argv[2], &off)) {
709                         puts("Offset is not a valid number\n");
710                         return 1;
711                 }
712
713                 printf("\nNAND torture: device %d offset 0x%llx size 0x%x\n",
714                         dev, off, nand->erasesize);
715                 ret = nand_torture(nand, off);
716                 printf(" %s\n", ret ? "Failed" : "Passed");
717
718                 return ret == 0 ? 0 : 1;
719         }
720 #endif
721
722         if (strcmp(cmd, "markbad") == 0) {
723                 argc -= 2;
724                 argv += 2;
725
726                 if (argc <= 0)
727                         goto usage;
728
729                 while (argc > 0) {
730                         addr = simple_strtoul(*argv, NULL, 16);
731
732                         if (nand->block_markbad(nand, addr)) {
733                                 printf("block 0x%08lx NOT marked "
734                                         "as bad! ERROR %d\n",
735                                         addr, ret);
736                                 ret = 1;
737                         } else {
738                                 printf("block 0x%08lx successfully "
739                                         "marked as bad\n",
740                                         addr);
741                         }
742                         --argc;
743                         ++argv;
744                 }
745                 return ret;
746         }
747
748         if (strcmp(cmd, "biterr") == 0) {
749                 /* todo */
750                 return 1;
751         }
752
753 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
754         if (strcmp(cmd, "lock") == 0) {
755                 int tight = 0;
756                 int status = 0;
757                 if (argc == 3) {
758                         if (!strcmp("tight", argv[2]))
759                                 tight = 1;
760                         if (!strcmp("status", argv[2]))
761                                 status = 1;
762                 }
763                 if (status) {
764                         do_nand_status(nand);
765                 } else {
766                         if (!nand_lock(nand, tight)) {
767                                 puts("NAND flash successfully locked\n");
768                         } else {
769                                 puts("Error locking NAND flash\n");
770                                 return 1;
771                         }
772                 }
773                 return 0;
774         }
775
776         if (strncmp(cmd, "unlock", 5) == 0) {
777                 int allexcept = 0;
778
779                 s = strchr(cmd, '.');
780
781                 if (s && !strcmp(s, ".allexcept"))
782                         allexcept = 1;
783
784                 if (arg_off_size(argc - 2, argv + 2, &dev, &off, &size) < 0)
785                         return 1;
786
787                 if (!nand_unlock(&nand_info[dev], off, size, allexcept)) {
788                         puts("NAND flash successfully unlocked\n");
789                 } else {
790                         puts("Error unlocking NAND flash, "
791                              "write and erase will probably fail\n");
792                         return 1;
793                 }
794                 return 0;
795         }
796 #endif
797
798 usage:
799         return CMD_RET_USAGE;
800 }
801
802 #ifdef CONFIG_SYS_LONGHELP
803 static char nand_help_text[] =
804         "info - show available NAND devices\n"
805         "nand device [dev] - show or set current device\n"
806         "nand read - addr off|partition size\n"
807         "nand write - addr off|partition size\n"
808         "    read/write 'size' bytes starting at offset 'off'\n"
809         "    to/from memory address 'addr', skipping bad blocks.\n"
810         "nand read.raw - addr off|partition [count]\n"
811         "nand write.raw - addr off|partition [count]\n"
812         "    Use read.raw/write.raw to avoid ECC and access the flash as-is.\n"
813 #ifdef CONFIG_CMD_NAND_TRIMFFS
814         "nand write.trimffs - addr off|partition size\n"
815         "    write 'size' bytes starting at offset 'off' from memory address\n"
816         "    'addr', skipping bad blocks and dropping any pages at the end\n"
817         "    of eraseblocks that contain only 0xFF\n"
818 #endif
819 #ifdef CONFIG_CMD_NAND_YAFFS
820         "nand write.yaffs - addr off|partition size\n"
821         "    write 'size' bytes starting at offset 'off' with yaffs format\n"
822         "    from memory address 'addr', skipping bad blocks.\n"
823 #endif
824         "nand erase[.spread] [clean] off size - erase 'size' bytes "
825         "from offset 'off'\n"
826         "    With '.spread', erase enough for given file size, otherwise,\n"
827         "    'size' includes skipped bad blocks.\n"
828         "nand erase.part [clean] partition - erase entire mtd partition'\n"
829         "nand erase.chip [clean] - erase entire chip'\n"
830         "nand bad - show bad blocks\n"
831         "nand dump[.oob] off - dump page\n"
832 #ifdef CONFIG_CMD_NAND_TORTURE
833         "nand torture off - torture block at offset\n"
834 #endif
835         "nand scrub [-y] off size | scrub.part partition | scrub.chip\n"
836         "    really clean NAND erasing bad blocks (UNSAFE)\n"
837         "nand markbad off [...] - mark bad block(s) at offset (UNSAFE)\n"
838         "nand biterr off - make a bit error at offset (UNSAFE)"
839 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
840         "\n"
841         "nand lock [tight] [status]\n"
842         "    bring nand to lock state or display locked pages\n"
843         "nand unlock[.allexcept] [offset] [size] - unlock section"
844 #endif
845 #ifdef CONFIG_ENV_OFFSET_OOB
846         "\n"
847         "nand env.oob - environment offset in OOB of block 0 of"
848         "    first device.\n"
849         "nand env.oob set off|partition - set enviromnent offset\n"
850         "nand env.oob get - get environment offset"
851 #endif
852         "";
853 #endif
854
855 U_BOOT_CMD(
856         nand, CONFIG_SYS_MAXARGS, 1, do_nand,
857         "NAND sub-system", nand_help_text
858 );
859
860 static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
861                            ulong offset, ulong addr, char *cmd)
862 {
863         int r;
864         char *s;
865         size_t cnt;
866         image_header_t *hdr;
867 #if defined(CONFIG_FIT)
868         const void *fit_hdr = NULL;
869 #endif
870
871         s = strchr(cmd, '.');
872         if (s != NULL &&
873             (strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) {
874                 printf("Unknown nand load suffix '%s'\n", s);
875                 bootstage_error(BOOTSTAGE_ID_NAND_SUFFIX);
876                 return 1;
877         }
878
879         printf("\nLoading from %s, offset 0x%lx\n", nand->name, offset);
880
881         cnt = nand->writesize;
882         r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
883         if (r) {
884                 puts("** Read error\n");
885                 bootstage_error(BOOTSTAGE_ID_NAND_HDR_READ);
886                 return 1;
887         }
888         bootstage_mark(BOOTSTAGE_ID_NAND_HDR_READ);
889
890         switch (genimg_get_format ((void *)addr)) {
891         case IMAGE_FORMAT_LEGACY:
892                 hdr = (image_header_t *)addr;
893
894                 bootstage_mark(BOOTSTAGE_ID_NAND_TYPE);
895                 image_print_contents (hdr);
896
897                 cnt = image_get_image_size (hdr);
898                 break;
899 #if defined(CONFIG_FIT)
900         case IMAGE_FORMAT_FIT:
901                 fit_hdr = (const void *)addr;
902                 puts ("Fit image detected...\n");
903
904                 cnt = fit_get_size (fit_hdr);
905                 break;
906 #endif
907         default:
908                 bootstage_error(BOOTSTAGE_ID_NAND_TYPE);
909                 puts ("** Unknown image type\n");
910                 return 1;
911         }
912         bootstage_mark(BOOTSTAGE_ID_NAND_TYPE);
913
914         r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
915         if (r) {
916                 puts("** Read error\n");
917                 bootstage_error(BOOTSTAGE_ID_NAND_READ);
918                 return 1;
919         }
920         bootstage_mark(BOOTSTAGE_ID_NAND_READ);
921
922 #if defined(CONFIG_FIT)
923         /* This cannot be done earlier, we need complete FIT image in RAM first */
924         if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
925                 if (!fit_check_format (fit_hdr)) {
926                         bootstage_error(BOOTSTAGE_ID_NAND_FIT_READ);
927                         puts ("** Bad FIT image format\n");
928                         return 1;
929                 }
930                 bootstage_mark(BOOTSTAGE_ID_NAND_FIT_READ_OK);
931                 fit_print_contents (fit_hdr);
932         }
933 #endif
934
935         /* Loading ok, update default load address */
936
937         load_addr = addr;
938
939         return bootm_maybe_autostart(cmdtp, cmd);
940 }
941
942 static int do_nandboot(cmd_tbl_t *cmdtp, int flag, int argc,
943                        char * const argv[])
944 {
945         char *boot_device = NULL;
946         int idx;
947         ulong addr, offset = 0;
948 #if defined(CONFIG_CMD_MTDPARTS)
949         struct mtd_device *dev;
950         struct part_info *part;
951         u8 pnum;
952
953         if (argc >= 2) {
954                 char *p = (argc == 2) ? argv[1] : argv[2];
955                 if (!(str2long(p, &addr)) && (mtdparts_init() == 0) &&
956                     (find_dev_and_part(p, &dev, &pnum, &part) == 0)) {
957                         if (dev->id->type != MTD_DEV_TYPE_NAND) {
958                                 puts("Not a NAND device\n");
959                                 return 1;
960                         }
961                         if (argc > 3)
962                                 goto usage;
963                         if (argc == 3)
964                                 addr = simple_strtoul(argv[1], NULL, 16);
965                         else
966                                 addr = CONFIG_SYS_LOAD_ADDR;
967                         return nand_load_image(cmdtp, &nand_info[dev->id->num],
968                                                part->offset, addr, argv[0]);
969                 }
970         }
971 #endif
972
973         bootstage_mark(BOOTSTAGE_ID_NAND_PART);
974         switch (argc) {
975         case 1:
976                 addr = CONFIG_SYS_LOAD_ADDR;
977                 boot_device = getenv("bootdevice");
978                 break;
979         case 2:
980                 addr = simple_strtoul(argv[1], NULL, 16);
981                 boot_device = getenv("bootdevice");
982                 break;
983         case 3:
984                 addr = simple_strtoul(argv[1], NULL, 16);
985                 boot_device = argv[2];
986                 break;
987         case 4:
988                 addr = simple_strtoul(argv[1], NULL, 16);
989                 boot_device = argv[2];
990                 offset = simple_strtoul(argv[3], NULL, 16);
991                 break;
992         default:
993 #if defined(CONFIG_CMD_MTDPARTS)
994 usage:
995 #endif
996                 bootstage_error(BOOTSTAGE_ID_NAND_SUFFIX);
997                 return CMD_RET_USAGE;
998         }
999         bootstage_mark(BOOTSTAGE_ID_NAND_SUFFIX);
1000
1001         if (!boot_device) {
1002                 puts("\n** No boot device **\n");
1003                 bootstage_error(BOOTSTAGE_ID_NAND_BOOT_DEVICE);
1004                 return 1;
1005         }
1006         bootstage_mark(BOOTSTAGE_ID_NAND_BOOT_DEVICE);
1007
1008         idx = simple_strtoul(boot_device, NULL, 16);
1009
1010         if (idx < 0 || idx >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[idx].name) {
1011                 printf("\n** Device %d not available\n", idx);
1012                 bootstage_error(BOOTSTAGE_ID_NAND_AVAILABLE);
1013                 return 1;
1014         }
1015         bootstage_mark(BOOTSTAGE_ID_NAND_AVAILABLE);
1016
1017         return nand_load_image(cmdtp, &nand_info[idx], offset, addr, argv[0]);
1018 }
1019
1020 U_BOOT_CMD(nboot, 4, 1, do_nandboot,
1021         "boot from NAND device",
1022         "[partition] | [[[loadAddr] dev] offset]"
1023 );