KS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH

[u-boot] / common / main.c

diff --git a/common/main.c b/common/main.c
index 01931a1bffc14c9b73d1d34f9b0f1ab39f8dcd8c..3324d9d6e433a9b91efee84eea73e4f5f2d49cc6 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -30,6 +30,7 @@
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
+#include <version.h>
 #ifdef CONFIG_MODEM_SUPPORT
 #include <malloc.h>            /* for free() prototype */
 #endif
@@ -51,7 +52,7 @@ void inline __show_boot_progress (int val) {}
 void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
 
 #if defined(CONFIG_UPDATE_TFTP)
-void update_tftp (void);
+int update_tftp (ulong addr);
 #endif /* CONFIG_UPDATE_TFTP */
 
 #define MAX_DELAY_STOP_STR 32
@@ -307,8 +308,6 @@ void main_loop (void)
 
 #ifdef CONFIG_VERSION_VARIABLE
        {
-               extern char version_string[];
-
                setenv ("ver", version_string);  /* set version variable */
        }
 #endif /* CONFIG_VERSION_VARIABLE */
@@ -341,7 +340,7 @@ void main_loop (void)
 #endif /* CONFIG_PREBOOT */
 
 #if defined(CONFIG_UPDATE_TFTP)
-       update_tftp ();
+       update_tftp (0UL);
 #endif /* CONFIG_UPDATE_TFTP */
 
 #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
@@ -391,15 +390,15 @@ void main_loop (void)
 
 # ifdef CONFIG_MENUKEY
        if (menukey == CONFIG_MENUKEY) {
-           s = getenv("menucmd");
-           if (s) {
+               s = getenv("menucmd");
+               if (s) {
 # ifndef CONFIG_SYS_HUSH_PARSER
-               run_command (s, 0);
+                       run_command(s, 0);
 # else
-               parse_string_outer(s, FLAG_PARSE_SEMICOLON |
-                                   FLAG_EXIT_FROM_LOOP);
+                       parse_string_outer(s, FLAG_PARSE_SEMICOLON |
+                                               FLAG_EXIT_FROM_LOOP);
 # endif
-           }
+               }
        }
 #endif /* CONFIG_MENUKEY */
 #endif /* CONFIG_BOOTDELAY */