]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - common/cmd_flash.c
am335x_evm: Regroup USB options
[karo-tx-uboot.git] / common / cmd_flash.c
index a51b5e998cd1e79e6b028f7c322d1bedd99e2d5c..85d18bb2c53a4787af348147fe2dd1a4b7242c42 100644 (file)
@@ -2,23 +2,7 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
 #include <common.h>
 #include <command.h>
 
-
 #ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_FLASH)
+#if defined(CONFIG_CMD_MTDPARTS)
+#include <jffs2/jffs2.h>
+
+/* partition handling routines */
+int mtdparts_init(void);
+int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num);
+int find_dev_and_part(const char *id, struct mtd_device **dev,
+               u8 *part_num, struct part_info **part);
+#endif
 
+#ifndef CONFIG_SYS_NO_FLASH
+#include <flash.h>
+#include <mtd/cfi_flash.h>
 extern flash_info_t flash_info[];      /* info for FLASH chips */
 
 /*
@@ -68,7 +62,7 @@ abbrev_spec (char *str, flash_info_t ** pinfo, int *psf, int *psl)
 
        bank = simple_strtoul (str, &ep, 10);
        if (ep == str || *ep != '\0' ||
-               bank < 1 || bank > CFG_MAX_FLASH_BANKS ||
+               bank < 1 || bank > CONFIG_SYS_MAX_FLASH_BANKS ||
                (fp = &flash_info[bank - 1])->flash_id == FLASH_UNKNOWN)
                return -1;
 
@@ -96,6 +90,105 @@ abbrev_spec (char *str, flash_info_t ** pinfo, int *psf, int *psl)
        return 1;
 }
 
+/*
+ * Take *addr in Flash and adjust it to fall on the end of its sector
+ */
+int flash_sect_roundb (ulong *addr)
+{
+       flash_info_t *info;
+       ulong bank, sector_end_addr;
+       char found;
+       int i;
+
+       /* find the end addr of the sector where the *addr is */
+       found = 0;
+       for (bank = 0; bank < CONFIG_SYS_MAX_FLASH_BANKS && !found; ++bank) {
+               info = &flash_info[bank];
+               for (i = 0; i < info->sector_count && !found; ++i) {
+                       /* get the end address of the sector */
+                       if (i == info->sector_count - 1) {
+                               sector_end_addr = info->start[0] +
+                                                               info->size - 1;
+                       } else {
+                               sector_end_addr = info->start[i+1] - 1;
+                       }
+
+                       if (*addr <= sector_end_addr &&
+                                               *addr >= info->start[i]) {
+                               found = 1;
+                               /* adjust *addr if necessary */
+                               if (*addr < sector_end_addr)
+                                       *addr = sector_end_addr;
+                       } /* sector */
+               } /* bank */
+       }
+       if (!found) {
+               /* error, address not in flash */
+               printf("Error: end address (0x%08lx) not in flash!\n", *addr);
+               return 1;
+       }
+
+       return 0;
+}
+
+/*
+ * This function computes the start and end addresses for both
+ * erase and protect commands. The range of the addresses on which
+ * either of the commands is to operate can be given in two forms:
+ * 1. <cmd> start end - operate on <'start',  'end')
+ * 2. <cmd> start +length - operate on <'start', start + length)
+ * If the second form is used and the end address doesn't fall on the
+ * sector boundary, than it will be adjusted to the next sector boundary.
+ * If it isn't in the flash, the function will fail (return -1).
+ * Input:
+ *    arg1, arg2: address specification (i.e. both command arguments)
+ * Output:
+ *    addr_first, addr_last: computed address range
+ * Return:
+ *    1: success
+ *   -1: failure (bad format, bad address).
+*/
+static int
+addr_spec(char *arg1, char *arg2, ulong *addr_first, ulong *addr_last)
+{
+       char *ep;
+       char len_used; /* indicates if the "start +length" form used */
+
+       *addr_first = simple_strtoul(arg1, &ep, 16);
+       if (ep == arg1 || *ep != '\0')
+               return -1;
+
+       len_used = 0;
+       if (arg2 && *arg2 == '+'){
+               len_used = 1;
+               ++arg2;
+       }
+
+       *addr_last = simple_strtoul(arg2, &ep, 16);
+       if (ep == arg2 || *ep != '\0')
+               return -1;
+
+       if (len_used){
+               /*
+                * *addr_last has the length, compute correct *addr_last
+                * XXX watch out for the integer overflow! Right now it is
+                * checked for in both the callers.
+                */
+               *addr_last = *addr_first + *addr_last - 1;
+
+               /*
+                * It may happen that *addr_last doesn't fall on the sector
+                * boundary. We want to round such an address to the next
+                * sector boundary, so that the commands don't fail later on.
+                */
+
+               if (flash_sect_roundb(addr_last) > 0)
+                       return -1;
+       } /* "start +length" from used */
+
+       return 1;
+}
+
 static int
 flash_fill_sect_ranges (ulong addr_first, ulong addr_last,
                        int *s_first, int *s_last,
@@ -107,13 +200,13 @@ flash_fill_sect_ranges (ulong addr_first, ulong addr_last,
 
        *s_count = 0;
 
-       for (bank=0; bank < CFG_MAX_FLASH_BANKS; ++bank) {
+       for (bank=0; bank < CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
                s_first[bank] = -1;     /* first sector to erase        */
                s_last [bank] = -1;     /* last  sector to erase        */
        }
 
-       for (bank=0,info=&flash_info[0];
-            (bank < CFG_MAX_FLASH_BANKS) && (addr_first <= addr_last);
+       for (bank=0,info = &flash_info[0];
+            (bank < CONFIG_SYS_MAX_FLASH_BANKS) && (addr_first <= addr_last);
             ++bank, ++info) {
                ulong b_end;
                int sect;
@@ -149,14 +242,14 @@ flash_fill_sect_ranges (ulong addr_first, ulong addr_last,
                                if (addr_last > b_end) {
                                        s_last[bank] = s_end;
                                } else {
-                                       printf ("Error: end address"
+                                       puts ("Error: end address"
                                                " not on sector boundary\n");
                                        rcode = 1;
                                        break;
                                }
                        }
                        if (s_last[bank] < s_first[bank]) {
-                               printf ("Error: end sector"
+                               puts ("Error: end sector"
                                        " precedes start sector\n");
                                rcode = 1;
                                break;
@@ -164,8 +257,12 @@ flash_fill_sect_ranges (ulong addr_first, ulong addr_last,
                        sect = s_last[bank];
                        addr_first = (sect == s_end) ? b_end + 1: info->start[sect + 1];
                        (*s_count) += s_last[bank] - s_first[bank] + 1;
+               } else if (addr_first >= info->start[0] && addr_first < b_end) {
+                       puts ("Error: start address not on sector boundary\n");
+                       rcode = 1;
+                       break;
                } else if (s_last[bank] >= 0) {
-                       printf("Error: cannot span across banks when they are"
+                       puts ("Error: cannot span across banks when they are"
                               " mapped in reverse order\n");
                        rcode = 1;
                        break;
@@ -174,17 +271,21 @@ flash_fill_sect_ranges (ulong addr_first, ulong addr_last,
 
        return rcode;
 }
+#endif /* CONFIG_SYS_NO_FLASH */
 
-int do_flinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_flinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
+#ifndef CONFIG_SYS_NO_FLASH
        ulong bank;
+#endif
 
 #ifdef CONFIG_HAS_DATAFLASH
        dataflash_print_info();
 #endif
 
+#ifndef CONFIG_SYS_NO_FLASH
        if (argc == 1) {        /* print info for all FLASH banks */
-               for (bank=0; bank <CFG_MAX_FLASH_BANKS; ++bank) {
+               for (bank=0; bank <CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
                        printf ("\nBank # %ld: ", bank+1);
 
                        flash_print_info (&flash_info[bank]);
@@ -193,29 +294,35 @@ int do_flinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 
        bank = simple_strtoul(argv[1], NULL, 16);
-       if ((bank < 1) || (bank > CFG_MAX_FLASH_BANKS)) {
+       if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
                printf ("Only FLASH Banks # 1 ... # %d supported\n",
-                       CFG_MAX_FLASH_BANKS);
+                       CONFIG_SYS_MAX_FLASH_BANKS);
                return 1;
        }
        printf ("\nBank # %ld: ", bank);
        flash_print_info (&flash_info[bank-1]);
+#endif /* CONFIG_SYS_NO_FLASH */
        return 0;
 }
-int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+
+static int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       flash_info_t *info;
+#ifndef CONFIG_SYS_NO_FLASH
+       flash_info_t *info = NULL;
        ulong bank, addr_first, addr_last;
-       int n, sect_first, sect_last;
+       int n, sect_first = 0, sect_last = 0;
+#if defined(CONFIG_CMD_MTDPARTS)
+       struct mtd_device *dev;
+       struct part_info *part;
+       u8 dev_type, dev_num, pnum;
+#endif
        int rcode = 0;
 
-       if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc < 2)
+               return CMD_RET_USAGE;
 
        if (strcmp(argv[1], "all") == 0) {
-               for (bank=1; bank<=CFG_MAX_FLASH_BANKS; ++bank) {
+               for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
                        printf ("Erase Flash Bank # %ld ", bank);
                        info = &flash_info[bank-1];
                        rcode = flash_erase (info, 0, info->sector_count-1);
@@ -225,25 +332,49 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if ((n = abbrev_spec(argv[1], &info, &sect_first, &sect_last)) != 0) {
                if (n < 0) {
-                       printf("Bad sector specification\n");
+                       puts ("Bad sector specification\n");
                        return 1;
                }
-               printf ("Erase Flash Sectors %d-%d in Bank # %d ",
+               printf ("Erase Flash Sectors %d-%d in Bank # %zu ",
                        sect_first, sect_last, (info-flash_info)+1);
                rcode = flash_erase(info, sect_first, sect_last);
                return rcode;
        }
 
-       if (argc != 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
+#if defined(CONFIG_CMD_MTDPARTS)
+       /* erase <part-id> - erase partition */
+       if ((argc == 2) && (mtd_id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) {
+               mtdparts_init();
+               if (find_dev_and_part(argv[1], &dev, &pnum, &part) == 0) {
+                       if (dev->id->type == MTD_DEV_TYPE_NOR) {
+                               bank = dev->id->num;
+                               info = &flash_info[bank];
+                               addr_first = part->offset + info->start[0];
+                               addr_last = addr_first + part->size - 1;
+
+                               printf ("Erase Flash Partition %s, "
+                                               "bank %ld, 0x%08lx - 0x%08lx ",
+                                               argv[1], bank, addr_first,
+                                               addr_last);
+
+                               rcode = flash_sect_erase(addr_first, addr_last);
+                               return rcode;
+                       }
+
+                       printf("cannot erase, not a NOR device\n");
+                       return 1;
+               }
        }
+#endif
+
+       if (argc != 3)
+               return CMD_RET_USAGE;
 
        if (strcmp(argv[1], "bank") == 0) {
                bank = simple_strtoul(argv[2], NULL, 16);
-               if ((bank < 1) || (bank > CFG_MAX_FLASH_BANKS)) {
+               if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
                        printf ("Only FLASH Banks # 1 ... # %d supported\n",
-                               CFG_MAX_FLASH_BANKS);
+                               CONFIG_SYS_MAX_FLASH_BANKS);
                        return 1;
                }
                printf ("Erase Flash Bank # %ld ", bank);
@@ -252,23 +383,27 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return rcode;
        }
 
-       addr_first = simple_strtoul(argv[1], NULL, 16);
-       addr_last  = simple_strtoul(argv[2], NULL, 16);
-
-       if (addr_first >= addr_last) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+       if (addr_spec(argv[1], argv[2], &addr_first, &addr_last) < 0){
+               printf ("Bad address format\n");
                return 1;
        }
 
+       if (addr_first >= addr_last)
+               return CMD_RET_USAGE;
+
        rcode = flash_sect_erase(addr_first, addr_last);
        return rcode;
+#else
+       return 0;
+#endif /* CONFIG_SYS_NO_FLASH */
 }
 
+#ifndef CONFIG_SYS_NO_FLASH
 int flash_sect_erase (ulong addr_first, ulong addr_last)
 {
        flash_info_t *info;
        ulong bank;
-       int s_first[CFG_MAX_FLASH_BANKS], s_last[CFG_MAX_FLASH_BANKS];
+       int s_first[CONFIG_SYS_MAX_FLASH_BANKS], s_last[CONFIG_SYS_MAX_FLASH_BANKS];
        int erased = 0;
        int planned;
        int rcode = 0;
@@ -277,8 +412,8 @@ int flash_sect_erase (ulong addr_first, ulong addr_last)
                                        s_first, s_last, &planned );
 
        if (planned && (rcode == 0)) {
-               for (bank=0,info=&flash_info[0];
-                    (bank < CFG_MAX_FLASH_BANKS) && (rcode == 0);
+               for (bank=0,info = &flash_info[0];
+                    (bank < CONFIG_SYS_MAX_FLASH_BANKS) && (rcode == 0);
                     ++bank, ++info) {
                        if (s_first[bank]>=0) {
                                erased += s_last[bank] - s_first[bank] + 1;
@@ -292,37 +427,49 @@ int flash_sect_erase (ulong addr_first, ulong addr_last)
                                rcode = flash_erase (info, s_first[bank], s_last[bank]);
                        }
                }
-               printf ("Erased %d sectors\n", erased);
+               if (rcode == 0)
+                       printf("Erased %d sectors\n", erased);
        } else if (rcode == 0) {
-               printf ("Error: start and/or end address"
+               puts ("Error: start and/or end address"
                        " not on sector boundary\n");
                rcode = 1;
        }
        return rcode;
 }
+#endif /* CONFIG_SYS_NO_FLASH */
 
-int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_protect(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       flash_info_t *info;
-       ulong bank, addr_first, addr_last;
-       int i, p, n, sect_first, sect_last;
        int rcode = 0;
+#ifndef CONFIG_SYS_NO_FLASH
+       flash_info_t *info = NULL;
+       ulong bank;
+       int i, n, sect_first = 0, sect_last = 0;
+#if defined(CONFIG_CMD_MTDPARTS)
+       struct mtd_device *dev;
+       struct part_info *part;
+       u8 dev_type, dev_num, pnum;
+#endif
+#endif /* CONFIG_SYS_NO_FLASH */
 #ifdef CONFIG_HAS_DATAFLASH
        int status;
 #endif
-       if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH)
+       int p;
+       ulong addr_first, addr_last;
+#endif
+
+       if (argc < 3)
+               return CMD_RET_USAGE;
 
-       if (strcmp(argv[1], "off") == 0) {
+#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH)
+       if (strcmp(argv[1], "off") == 0)
                p = 0;
-       } else if (strcmp(argv[1], "on") == 0) {
+       else if (strcmp(argv[1], "on") == 0)
                p = 1;
-       } else {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       else
+               return CMD_RET_USAGE;
+#endif
 
 #ifdef CONFIG_HAS_DATAFLASH
        if ((strcmp(argv[2], "all") != 0) && (strcmp(argv[2], "bank") != 0)) {
@@ -332,18 +479,19 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                if (addr_dataflash(addr_first) && addr_dataflash(addr_last)) {
                        status = dataflash_real_protect(p,addr_first,addr_last);
                        if (status < 0){
-                               printf("Bad DataFlash sector specification\n");
-                               return 1;
-                       }
-                       printf("%sProtect %d DataFlash Sectors\n",
-                               p ? "" : "Un-", status);
+                               puts ("Bad DataFlash sector specification\n");
+                               return 1;
+                       }
+                       printf("%sProtect %d DataFlash Sectors\n",
+                               p ? "" : "Un-", status);
                        return 0;
                }
        }
 #endif
-       
+
+#ifndef CONFIG_SYS_NO_FLASH
        if (strcmp(argv[2], "all") == 0) {
-               for (bank=1; bank<=CFG_MAX_FLASH_BANKS; ++bank) {
+               for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
                        info = &flash_info[bank-1];
                        if (info->flash_id == FLASH_UNKNOWN) {
                                continue;
@@ -352,58 +500,81 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                p ? "" : "Un-", bank);
 
                        for (i=0; i<info->sector_count; ++i) {
-#if defined(CFG_FLASH_PROTECTION)
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
                                if (flash_real_protect(info, i, p))
                                        rcode = 1;
                                putc ('.');
 #else
                                info->protect[i] = p;
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
                        }
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
+                       if (!rcode) puts (" done\n");
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
                }
-
-#if defined(CFG_FLASH_PROTECTION)
-               if (!rcode) puts (" done\n");
-#endif /* CFG_FLASH_PROTECTION */
-
                return rcode;
        }
 
        if ((n = abbrev_spec(argv[2], &info, &sect_first, &sect_last)) != 0) {
                if (n < 0) {
-                       printf("Bad sector specification\n");
+                       puts ("Bad sector specification\n");
                        return 1;
                }
-               printf("%sProtect Flash Sectors %d-%d in Bank # %d\n",
+               printf("%sProtect Flash Sectors %d-%d in Bank # %zu\n",
                        p ? "" : "Un-", sect_first, sect_last,
                        (info-flash_info)+1);
                for (i = sect_first; i <= sect_last; i++) {
-#if defined(CFG_FLASH_PROTECTION)
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
                        if (flash_real_protect(info, i, p))
                                rcode =  1;
                        putc ('.');
 #else
                        info->protect[i] = p;
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
                }
 
-#if defined(CFG_FLASH_PROTECTION)
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
                if (!rcode) puts (" done\n");
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
 
                return rcode;
        }
 
-       if (argc != 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
+#if defined(CONFIG_CMD_MTDPARTS)
+       /* protect on/off <part-id> */
+       if ((argc == 3) && (mtd_id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) {
+               mtdparts_init();
+               if (find_dev_and_part(argv[2], &dev, &pnum, &part) == 0) {
+                       if (dev->id->type == MTD_DEV_TYPE_NOR) {
+                               bank = dev->id->num;
+                               info = &flash_info[bank];
+                               addr_first = part->offset + info->start[0];
+                               addr_last = addr_first + part->size - 1;
+
+                               printf ("%sProtect Flash Partition %s, "
+                                               "bank %ld, 0x%08lx - 0x%08lx\n",
+                                               p ? "" : "Un", argv[1],
+                                               bank, addr_first, addr_last);
+
+                               rcode = flash_sect_protect (p, addr_first, addr_last);
+                               return rcode;
+                       }
+
+                       printf("cannot %sprotect, not a NOR device\n",
+                                       p ? "" : "un");
+                       return 1;
+               }
        }
+#endif
+
+       if (argc != 4)
+               return CMD_RET_USAGE;
 
        if (strcmp(argv[2], "bank") == 0) {
                bank = simple_strtoul(argv[3], NULL, 16);
-               if ((bank < 1) || (bank > CFG_MAX_FLASH_BANKS)) {
+               if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
                        printf ("Only FLASH Banks # 1 ... # %d supported\n",
-                               CFG_MAX_FLASH_BANKS);
+                               CONFIG_SYS_MAX_FLASH_BANKS);
                        return 1;
                }
                printf ("%sProtect Flash Bank # %ld\n",
@@ -411,43 +582,45 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                info = &flash_info[bank-1];
 
                if (info->flash_id == FLASH_UNKNOWN) {
-                       printf ("missing or unknown FLASH type\n");
+                       puts ("missing or unknown FLASH type\n");
                        return 1;
                }
                for (i=0; i<info->sector_count; ++i) {
-#if defined(CFG_FLASH_PROTECTION)
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
                        if (flash_real_protect(info, i, p))
                                rcode =  1;
                        putc ('.');
 #else
                        info->protect[i] = p;
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
                }
 
-#if defined(CFG_FLASH_PROTECTION)
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
                if (!rcode) puts (" done\n");
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
 
                return rcode;
        }
 
-       addr_first = simple_strtoul(argv[2], NULL, 16);
-       addr_last  = simple_strtoul(argv[3], NULL, 16);
-
-       if (addr_first >= addr_last) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+       if (addr_spec(argv[2], argv[3], &addr_first, &addr_last) < 0){
+               printf("Bad address format\n");
                return 1;
        }
+
+       if (addr_first >= addr_last)
+               return CMD_RET_USAGE;
+
        rcode = flash_sect_protect (p, addr_first, addr_last);
+#endif /* CONFIG_SYS_NO_FLASH */
        return rcode;
 }
 
-
+#ifndef CONFIG_SYS_NO_FLASH
 int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
 {
        flash_info_t *info;
        ulong bank;
-       int s_first[CFG_MAX_FLASH_BANKS], s_last[CFG_MAX_FLASH_BANKS];
+       int s_first[CONFIG_SYS_MAX_FLASH_BANKS], s_last[CONFIG_SYS_MAX_FLASH_BANKS];
        int protected, i;
        int planned;
        int rcode;
@@ -457,75 +630,100 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
        protected = 0;
 
        if (planned && (rcode == 0)) {
-               for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
+               for (bank=0,info = &flash_info[0]; bank < CONFIG_SYS_MAX_FLASH_BANKS; ++bank, ++info) {
                        if (info->flash_id == FLASH_UNKNOWN) {
                                continue;
                        }
 
                        if (s_first[bank]>=0 && s_first[bank]<=s_last[bank]) {
-                               debug ("Protecting sectors %d..%d in bank %ld\n",
+                               debug ("%sProtecting sectors %d..%d in bank %ld\n",
+                                       p ? "" : "Un-",
                                        s_first[bank], s_last[bank], bank+1);
                                protected += s_last[bank] - s_first[bank] + 1;
                                for (i=s_first[bank]; i<=s_last[bank]; ++i) {
-#if defined(CFG_FLASH_PROTECTION)
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
                                        if (flash_real_protect(info, i, p))
                                                rcode = 1;
                                        putc ('.');
 #else
                                        info->protect[i] = p;
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
                                }
                        }
-#if defined(CFG_FLASH_PROTECTION)
-                       if (!rcode) putc ('\n');
-#endif /* CFG_FLASH_PROTECTION */
                }
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
+               puts (" done\n");
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
 
                printf ("%sProtected %d sectors\n",
                        p ? "" : "Un-", protected);
        } else if (rcode == 0) {
-               printf ("Error: start and/or end address"
+               puts ("Error: start and/or end address"
                        " not on sector boundary\n");
                rcode = 1;
        }
        return rcode;
 }
+#endif /* CONFIG_SYS_NO_FLASH */
 
 
 /**************************************************/
+#if defined(CONFIG_CMD_MTDPARTS)
+# define TMP_ERASE     "erase <part-id>\n    - erase partition\n"
+# define TMP_PROT_ON   "protect on <part-id>\n    - protect partition\n"
+# define TMP_PROT_OFF  "protect off <part-id>\n    - make partition writable\n"
+#else
+# define TMP_ERASE     /* empty */
+# define TMP_PROT_ON   /* empty */
+# define TMP_PROT_OFF  /* empty */
+#endif
 
 U_BOOT_CMD(
        flinfo,    2,    1,    do_flinfo,
-       "flinfo  - print FLASH memory information\n",
+       "print FLASH memory information",
        "\n    - print information for all FLASH memory banks\n"
-       "flinfo N\n    - print information for FLASH memory bank # N\n"
+       "flinfo N\n    - print information for FLASH memory bank # N"
 );
 
 U_BOOT_CMD(
-       erase,   3,   1,  do_flerase,
-       "erase   - erase FLASH memory\n",
+       erase,   3,   0,  do_flerase,
+       "erase FLASH memory",
        "start end\n"
        "    - erase FLASH from addr 'start' to addr 'end'\n"
+       "erase start +len\n"
+       "    - erase FLASH from addr 'start' to the end of sect "
+       "w/addr 'start'+'len'-1\n"
        "erase N:SF[-SL]\n    - erase sectors SF-SL in FLASH bank # N\n"
        "erase bank N\n    - erase FLASH bank # N\n"
-       "erase all\n    - erase all FLASH banks\n"
+       TMP_ERASE
+       "erase all\n    - erase all FLASH banks"
 );
 
 U_BOOT_CMD(
-       protect,  4,  1,   do_protect,
-       "protect - enable or disable FLASH write protection\n",
+       protect,  4,  0,   do_protect,
+       "enable or disable FLASH write protection",
        "on  start end\n"
        "    - protect FLASH from addr 'start' to addr 'end'\n"
+       "protect on start +len\n"
+       "    - protect FLASH from addr 'start' to end of sect "
+       "w/addr 'start'+'len'-1\n"
        "protect on  N:SF[-SL]\n"
        "    - protect sectors SF-SL in FLASH bank # N\n"
        "protect on  bank N\n    - protect FLASH bank # N\n"
+       TMP_PROT_ON
        "protect on  all\n    - protect all FLASH banks\n"
        "protect off start end\n"
        "    - make FLASH from addr 'start' to addr 'end' writable\n"
+       "protect off start +len\n"
+       "    - make FLASH from addr 'start' to end of sect "
+       "w/addr 'start'+'len'-1 wrtable\n"
        "protect off N:SF[-SL]\n"
        "    - make sectors SF-SL writable in FLASH bank # N\n"
        "protect off bank N\n    - make FLASH bank # N writable\n"
-       "protect off all\n    - make all FLASH banks writable\n"
+       TMP_PROT_OFF
+       "protect off all\n    - make all FLASH banks writable"
 );
 
-#endif /* CFG_CMD_FLASH */
+#undef TMP_ERASE
+#undef TMP_PROT_ON
+#undef TMP_PROT_OFF