Merge commit 'wd/master'

[u-boot] / drivers / mtd / nand / nand_util.c

diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index 4fd4e166e6ad6c36ed9d7ac9a8178b36e8ec6d9b..828cc338adbd4da11ba113c6b29cb6a6175a635b 100644 (file)
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -1,5 +1,5 @@
 /*
- * drivers/nand/nand_util.c
+ * drivers/mtd/nand/nand_util.c
  *
  * Copyright (C) 2006 by Weiss-Electronic GmbH.
  * All rights reserved.
@@ -153,6 +153,13 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
                priv_nand->bbt = NULL;
        }
 
+       if (erase_length < meminfo->erasesize) {
+               printf("Warning: Erase size 0x%08lx smaller than one "  \
+                      "erase block 0x%08x\n",erase_length, meminfo->erasesize);
+               printf("         Erasing 0x%08x instead\n", meminfo->erasesize);
+               erase_length = meminfo->erasesize;
+       }
+
        for (;
             erase.addr < opts->offset + erase_length;
             erase.addr += meminfo->erasesize) {
@@ -491,7 +498,7 @@ int nand_write_opts(nand_info_t *meminfo, const nand_write_options_t *opts)
                         * on (slow) serial consoles
                         */
                        if (percent != percent_complete) {
-                               printf("\rWriting data at 0x%x "
+                               printf("\rWriting data at 0x%lx "
                                       "-- %3d%% complete.",
                                       mtdoffset, percent);
                                percent_complete = percent;
@@ -671,7 +678,7 @@ int nand_read_opts(nand_info_t *meminfo, const nand_read_options_t *opts)
                         */
                        if (percent != percent_complete) {
                        if (!opts->quiet)
-                               printf("\rReading data from 0x%x "
+                               printf("\rReading data from 0x%lx "
                                       "-- %3d%% complete.",
                                       mtdoffset, percent);
                                percent_complete = percent;