Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

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

diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index 4fd4e16..c82f77b 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%08x 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) {