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

[u-boot] / common / cmd_onenand.c

diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c
index dcda099c84182e7d2da67d1eafb55fdda075fa1b..aff11d15c904d2944e77d7210d3fb1e1c1256fe1 100644 (file)
--- a/common/cmd_onenand.c
+++ b/common/cmd_onenand.c
@@ -44,14 +44,28 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        default:
                /* At least 4 args */
                if (strncmp(argv[1], "erase", 5) == 0) {
-                       struct erase_info instr;
+                       struct erase_info instr = {
+                               .callback       = NULL,
+                       };
                        ulong start, end;
                        ulong block;
-
-                       start = simple_strtoul(argv[2], NULL, 10);
-                       end = simple_strtoul(argv[3], NULL, 10);
-                       start -= (unsigned long)onenand_chip.base;
-                       end -= (unsigned long)onenand_chip.base;
+                       char *endtail;
+
+                       if (strncmp(argv[2], "block", 5) == 0) {
+                               start = simple_strtoul(argv[3], NULL, 10);
+                               endtail = strchr(argv[3], '-');
+                               end = simple_strtoul(endtail + 1, NULL, 10);
+                       } else {
+                               start = simple_strtoul(argv[2], NULL, 10);
+                               end = simple_strtoul(argv[3], NULL, 10);
+                               start -= (unsigned long)onenand_chip.base;
+                               end -= (unsigned long)onenand_chip.base;
+
+                               start >>= onenand_chip.erase_shift;
+                               end >>= onenand_chip.erase_shift;
+                               /* Don't include the end block */
+                               end--;
+                       }
 
                        if (!end || end < 0)
                                end = start;