IXP NPE: add support for fixed-speed MII ports

[karo-tx-uboot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 3949a5bb226e8b469529d7d56a068a7ca7a9a6a1..dcbacc9afc019aaddeb2e243367a3fea1f437fab 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -50,12 +50,6 @@ DECLARE_GLOBAL_DATA_PTR;
 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 */
-#endif
-
-extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
 #if defined(CONFIG_UPDATE_TFTP)
 void update_tftp (void);
 #endif /* CONFIG_UPDATE_TFTP */
@@ -71,8 +65,8 @@ static int abortboot(int);
 char        console_buffer[CONFIG_SYS_CBSIZE + 1];     /* console I/O buffer   */
 
 static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
-static char erase_seq[] = "\b \b";             /* erase sequence       */
-static char   tab_seq[] = "        ";          /* used to expand TABs  */
+static const char erase_seq[] = "\b \b";               /* erase sequence       */
+static const char   tab_seq[] = "        ";            /* used to expand TABs  */
 
 #ifdef CONFIG_BOOT_RETRY_TIME
 static uint64_t endtime = 0;  /* must be set, default is instant timeout */
@@ -342,10 +336,6 @@ void main_loop (void)
        hush_init_var ();
 #endif
 
-#ifdef CONFIG_AUTO_COMPLETE
-       install_auto_complete();
-#endif
-
 #ifdef CONFIG_PREBOOT
        if ((p = getenv ("preboot")) != NULL) {
 # ifdef CONFIG_AUTOBOOT_KEYED
@@ -427,14 +417,7 @@ void main_loop (void)
            }
        }
 #endif /* CONFIG_MENUKEY */
-#endif /* CONFIG_BOOTDELAY */
-
-#ifdef CONFIG_AMIGAONEG3SE
-       {
-           extern void video_banner(void);
-           video_banner();
-       }
-#endif
+#endif /* CONFIG_BOOTDELAY */
 
        /*
         * Main Loop for Monitor Command Processing
@@ -525,9 +508,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)
@@ -538,7 +518,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;
@@ -650,12 +630,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);              \
        }                                               \
 }
 
@@ -730,6 +708,7 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len)
                while (!tstc()) {       /* while no incoming data */
                        if (retry_time >= 0 && get_ticks() > endtime)
                                return (-2);    /* timed out */
+                       WATCHDOG_RESET();
                }
 #endif
 
@@ -955,7 +934,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;
 
@@ -997,6 +976,7 @@ int readline_into_buffer (const char *const prompt, char * buffer)
                while (!tstc()) {       /* while no incoming data */
                        if (retry_time >= 0 && get_ticks() > endtime)
                                return (-2);    /* timed out */
+                       WATCHDOG_RESET();
                }
 #endif
                WATCHDOG_RESET();               /* Trigger watchdog, if needed */
@@ -1005,6 +985,7 @@ int readline_into_buffer (const char *const prompt, char * buffer)
                while (!tstc()) {
                        extern void show_activity(int arg);
                        show_activity(0);
+                       WATCHDOG_RESET();
                }
 #endif
                c = getc();
@@ -1418,14 +1399,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;