do_reset: unify duplicate prototypes

[platform/kernel/u-boot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 8d548db..878cffd 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 * const argv[]);               /* for do_reset() prototype */
-#endif
-
-extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
-
 #if defined(CONFIG_UPDATE_TFTP)
 void update_tftp (void);
 #endif /* CONFIG_UPDATE_TFTP */
@@ -518,9 +512,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 +522,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;
@@ -947,7 +938,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;