armv7: rename cache related CONFIG flags

[u-boot] / common / main.c

diff --git a/common/main.c b/common/main.c
index d97ccd7dd846185650ea632f7844b450e74a1b23..2730c6f22f3f9fe5dc7433b9a7c1bfe9b9d159a4 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 */
@@ -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 */
@@ -294,17 +288,6 @@ void main_loop (void)
        char bcs_set[16];
 #endif /* CONFIG_BOOTCOUNT_LIMIT */
 
-#if defined(CONFIG_VFD) && defined(VFD_TEST_LOGO)
-       ulong bmp = 0;          /* default bitmap */
-       extern int trab_vfd (ulong bitmap);
-
-#ifdef CONFIG_MODEM_SUPPORT
-       if (do_mdm_init)
-               bmp = 1;        /* alternate bitmap */
-#endif
-       trab_vfd (bmp);
-#endif /* CONFIG_VFD && VFD_TEST_LOGO */
-
 #ifdef CONFIG_BOOTCOUNT_LIMIT
        bootcount = bootcount_load();
        bootcount++;
@@ -342,10 +325,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