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

[u-boot] / tools / updater / cmd_flash.c

diff --git a/tools/updater/cmd_flash.c b/tools/updater/cmd_flash.c
index 573546dbe95970e4a0430137e0d2294cedf55a7d..5ce45baeb44dd5f30aeaeb2a6f99a48fdc12e205 100644 (file)
--- a/tools/updater/cmd_flash.c
+++ b/tools/updater/cmd_flash.c
@@ -28,7 +28,7 @@
 #include <command.h>
 #include <flash.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_FLASH)
+#if defined(CONFIG_CMD_FLASH)
 
 extern flash_info_t flash_info[];      /* info for FLASH chips */
 
@@ -64,7 +64,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,8 +96,8 @@ int do_flinfo (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
        ulong bank;
 
        if (argc == 1) {        /* print info for all FLASH banks */
-               for (bank=0; bank <CFG_MAX_FLASH_BANKS; ++bank) {
-                       mon_printf ("\nBank # %ld: ", bank+1);
+               for (bank=0; bank <CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
+                       printf ("\nBank # %ld: ", bank+1);
 
                        flash_print_info (&flash_info[bank]);
                }
@@ -105,12 +105,12 @@ int do_flinfo (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
        }
 
        bank = simple_strtoul(argv[1], NULL, 16);
-       if ((bank < 1) || (bank > CFG_MAX_FLASH_BANKS)) {
-               mon_printf ("Only FLASH Banks # 1 ... # %d supported\n",
-                       CFG_MAX_FLASH_BANKS);
+       if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
+               printf ("Only FLASH Banks # 1 ... # %d supported\n",
+                       CONFIG_SYS_MAX_FLASH_BANKS);
                return 1;
        }
-       mon_printf ("\nBank # %ld: ", bank);
+       printf ("\nBank # %ld: ", bank);
        flash_print_info (&flash_info[bank-1]);
        return 0;
 }
@@ -122,13 +122,13 @@ int do_flerase(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
        int rcode = 0;
 
        if (argc < 2) {
-               mon_printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
        if (strcmp(argv[1], "all") == 0) {
-               for (bank=1; bank<=CFG_MAX_FLASH_BANKS; ++bank) {
-                       mon_printf ("Erase Flash Bank # %ld ", 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);
                }
@@ -137,28 +137,28 @@ int do_flerase(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 
        if ((n = abbrev_spec(argv[1], &info, &sect_first, &sect_last)) != 0) {
                if (n < 0) {
-                       mon_printf("Bad sector specification\n");
+                       printf("Bad sector specification\n");
                        return 1;
                }
-               mon_printf ("Erase Flash Sectors %d-%d in Bank # %d ",
+               printf ("Erase Flash Sectors %d-%d in Bank # %d ",
                        sect_first, sect_last, (info-flash_info)+1);
                rcode = flash_erase(info, sect_first, sect_last);
                return rcode;
        }
 
        if (argc != 3) {
-               mon_printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
        if (strcmp(argv[1], "bank") == 0) {
                bank = simple_strtoul(argv[2], NULL, 16);
-               if ((bank < 1) || (bank > CFG_MAX_FLASH_BANKS)) {
-                       mon_printf ("Only FLASH Banks # 1 ... # %d supported\n",
-                               CFG_MAX_FLASH_BANKS);
+               if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
+                       printf ("Only FLASH Banks # 1 ... # %d supported\n",
+                               CONFIG_SYS_MAX_FLASH_BANKS);
                        return 1;
                }
-               mon_printf ("Erase Flash Bank # %ld ", bank);
+               printf ("Erase Flash Bank # %ld ", bank);
                info = &flash_info[bank-1];
                rcode = flash_erase (info, 0, info->sector_count-1);
                return rcode;
@@ -168,11 +168,11 @@ int do_flerase(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
        addr_last  = simple_strtoul(argv[2], NULL, 16);
 
        if (addr_first >= addr_last) {
-               mon_printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
-       mon_printf ("Erase Flash from 0x%08lx to 0x%08lx ", addr_first, addr_last);
+       printf ("Erase Flash from 0x%08lx to 0x%08lx ", addr_first, addr_last);
        rcode = flash_sect_erase(addr_first, addr_last);
        return rcode;
 }
@@ -187,7 +187,7 @@ int flash_sect_erase (ulong addr_first, ulong addr_last)
 
        erased = 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) {
                ulong b_end;
                int sect;
 
@@ -226,9 +226,9 @@ int flash_sect_erase (ulong addr_first, ulong addr_last)
                }
        }
        if (erased) {
-           /*  mon_printf ("Erased %d sectors\n", erased); */
+           /*  printf ("Erased %d sectors\n", erased); */
        } else {
-               mon_printf ("Error: start and/or end address"
+               printf ("Error: start and/or end address"
                        " not on sector boundary\n");
                rcode = 1;
        }
@@ -244,7 +244,7 @@ int do_protect(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
        int rcode = 0;
 
        if (argc < 3) {
-               mon_printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -253,95 +253,95 @@ int do_protect(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
        else if (strcmp(argv[1], "on") == 0)
                p = 1;
        else {
-               mon_printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
        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;
                        }
-                       /*mon_printf ("%sProtect Flash Bank # %ld\n", */
+                       /*printf ("%sProtect Flash Bank # %ld\n", */
                        /*      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(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 ((n = abbrev_spec(argv[2], &info, &sect_first, &sect_last)) != 0) {
                if (n < 0) {
-                       mon_printf("Bad sector specification\n");
+                       printf("Bad sector specification\n");
                        return 1;
                }
-               /*mon_printf("%sProtect Flash Sectors %d-%d in Bank # %d\n", */
+               /*printf("%sProtect Flash Sectors %d-%d in Bank # %d\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) {
-               mon_printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
        if (strcmp(argv[2], "bank") == 0) {
                bank = simple_strtoul(argv[3], NULL, 16);
-               if ((bank < 1) || (bank > CFG_MAX_FLASH_BANKS)) {
-                       mon_printf ("Only FLASH Banks # 1 ... # %d supported\n",
-                               CFG_MAX_FLASH_BANKS);
+               if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
+                       printf ("Only FLASH Banks # 1 ... # %d supported\n",
+                               CONFIG_SYS_MAX_FLASH_BANKS);
                        return 1;
                }
-               mon_printf ("%sProtect Flash Bank # %ld\n",
+               printf ("%sProtect Flash Bank # %ld\n",
                        p ? "" : "Un-", bank);
                info = &flash_info[bank-1];
 
                if (info->flash_id == FLASH_UNKNOWN) {
-                       mon_printf ("missing or unknown FLASH type\n");
+                       printf ("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;
        }
@@ -350,7 +350,7 @@ int do_protect(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
        addr_last  = simple_strtoul(argv[3], NULL, 16);
 
        if (addr_first >= addr_last) {
-               mon_printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        rcode = flash_sect_protect (p, addr_first, addr_last);
@@ -366,7 +366,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
 
        protected = 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) {
                ulong b_end;
                int sect;
 
@@ -402,29 +402,29 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
                if (s_first>=0 && s_first<=s_last) {
                        protected += s_last - s_first + 1;
                        for (i=s_first; i<=s_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) putc ('\n');
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
 
        }
        if (protected) {
-           /*  mon_printf ("%sProtected %d sectors\n", */
+           /*  printf ("%sProtected %d sectors\n", */
            /*  p ? "" : "Un-", protected); */
        } else {
-           mon_printf ("Error: start and/or end address"
+           printf ("Error: start and/or end address"
                        " not on sector boundary\n");
                rcode = 1;
        }
        return rcode;
 }
 
-#endif /* CFG_CMD_FLASH */
+#endif