sh: sh3: Move to boards.cfg

[oweals/u-boot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 3760ba3d6b4c84a35da19ef2684ecbd2cf25e12d..d97ccd7dd846185650ea632f7844b450e74a1b23 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -51,10 +51,10 @@ void inline __show_boot_progress (int val) {}
 void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
 
 #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);              /* for do_reset() prototype */
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);               /* for do_reset() prototype */
 #endif
 
-extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
 #if defined(CONFIG_UPDATE_TFTP)
 void update_tftp (void);
@@ -518,9 +518,6 @@ void reset_cmd_timeout(void)
        } while (0)
 
 #define CTL_CH(c)              ((c) - 'a' + 1)
-
-#define MAX_CMDBUF_SIZE                CONFIG_SYS_CBSIZE
-
 #define CTL_BACKSPACE          ('\b')
 #define DEL                    ((char)255)
 #define DEL7                   ((char)127)
@@ -531,7 +528,7 @@ void reset_cmd_timeout(void)
 #define getcmd_cbeep()         getcmd_putch('\a')
 
 #define HIST_MAX               20
-#define HIST_SIZE              MAX_CMDBUF_SIZE
+#define HIST_SIZE              CONFIG_SYS_CBSIZE
 
 static int hist_max = 0;
 static int hist_add_idx = 0;
@@ -643,12 +640,10 @@ static void cread_print_hist_list(void)
 
 #define ERASE_TO_EOL() {                               \
        if (num < eol_num) {                            \
-               int tmp;                                \
-               for (tmp = num; tmp < eol_num; tmp++)   \
-                       getcmd_putch(' ');              \
-               while (tmp-- > num)                     \
+               printf("%*s", (int)(eol_num - num), ""); \
+               do {                                    \
                        getcmd_putch(CTL_BACKSPACE);    \
-               eol_num = num;                          \
+               } while (--eol_num > num);              \
        }                                               \
 }
 
@@ -949,7 +944,7 @@ int readline_into_buffer (const char *const prompt, char * buffer)
 {
        char *p = buffer;
 #ifdef CONFIG_CMDLINE_EDITING
-       unsigned int len=MAX_CMDBUF_SIZE;
+       unsigned int len = CONFIG_SYS_CBSIZE;
        int rc;
        static int initted = 0;
 
@@ -1414,14 +1409,12 @@ int run_command (const char *cmd, int flag)
 /****************************************************************************/
 
 #if defined(CONFIG_CMD_RUN)
-int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        int i;
 
-       if (argc < 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 2)
+               return cmd_usage(cmdtp);
 
        for (i=1; i<argc; ++i) {
                char *arg;