Merge branch 'next'

[people/ms/u-boot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 32618f139f2e601ff804e3057d4a185f151694f5..1a2ef39cca9c1b9ec83c15f3a25e805fd11c673c 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <autoboot.h>
 #include <cli.h>
+#include <console.h>
 #include <version.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -17,21 +18,7 @@ DECLARE_GLOBAL_DATA_PTR;
 /*
  * Board-specific Platform code can reimplement show_boot_progress () if needed
  */
-void inline __show_boot_progress (int val) {}
-void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
-
-static void modem_init(void)
-{
-#ifdef CONFIG_MODEM_SUPPORT
-       debug("DEBUG: main_loop:   gd->do_mdm_init=%lu\n", gd->do_mdm_init);
-       if (gd->do_mdm_init) {
-               char *str = getenv("mdm_cmd");
-
-               setenv("preboot", str);  /* set or delete definition */
-               mdm_init(); /* wait for modem connection */
-       }
-#endif  /* CONFIG_MODEM_SUPPORT */
-}
+__weak void show_boot_progress(int val) {}
 
 static void run_preboot_environment_command(void)
 {
@@ -66,7 +53,6 @@ void main_loop(void)
        puts("upgraded by the late 2014 may break or be removed.\n");
 #endif
 
-       modem_init();
 #ifdef CONFIG_VERSION_VARIABLE
        setenv("ver", version_string);  /* set version variable */
 #endif /* CONFIG_VERSION_VARIABLE */
@@ -76,7 +62,7 @@ void main_loop(void)
        run_preboot_environment_command();
 
 #if defined(CONFIG_UPDATE_TFTP)
-       update_tftp(0UL);
+       update_tftp(0UL, NULL, NULL);
 #endif /* CONFIG_UPDATE_TFTP */
 
        s = bootdelay_process();