Remove unnecessary instances of DECLARE_GLOBAL_DATA_PTR

[u-boot] / common / main.c

diff --git a/common/main.c b/common/main.c
index c4ed846c3b249b951e7bde1f0f0e7e49f95a63f0..66a03a156eb67e3086460b5cd7a156f7dcda9499 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -10,62 +10,20 @@
 #include <common.h>
 #include <autoboot.h>
 #include <cli.h>
-#include <cli_hush.h>
-#include <malloc.h>
+#include <console.h>
 #include <version.h>
 
 /*
  * 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")));
+__weak void show_boot_progress(int val) {}
 
-#ifdef CONFIG_MODEM_SUPPORT
-int do_mdm_init = 0;
-extern void mdm_init(void); /* defined in board.c */
-#endif
-
-void main_loop(void)
+static void run_preboot_environment_command(void)
 {
 #ifdef CONFIG_PREBOOT
        char *p;
-#endif
-
-       bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
 
-#ifndef CONFIG_SYS_GENERIC_BOARD
-       puts("Warning: Your board does not use generic board. Please read\n");
-       puts("doc/README.generic-board and take action. Boards not\n");
-       puts("upgraded by the late 2014 may break or be removed.\n");
-#endif
-
-#ifdef CONFIG_MODEM_SUPPORT
-       debug("DEBUG: main_loop:   do_mdm_init=%d\n", do_mdm_init);
-       if (do_mdm_init) {
-               char *str = strdup(getenv("mdm_cmd"));
-               setenv("preboot", str);  /* set or delete definition */
-               if (str != NULL)
-                       free(str);
-               mdm_init(); /* wait for modem connection */
-       }
-#endif  /* CONFIG_MODEM_SUPPORT */
-
-#ifdef CONFIG_VERSION_VARIABLE
-       {
-               setenv("ver", version_string);  /* set version variable */
-       }
-#endif /* CONFIG_VERSION_VARIABLE */
-
-#ifdef CONFIG_SYS_HUSH_PARSER
-       u_boot_hush_start();
-#endif
-
-#if defined(CONFIG_HUSH_INIT_VAR)
-       hush_init_var();
-#endif
-
-#ifdef CONFIG_PREBOOT
-       p = getenv("preboot");
+       p = env_get("preboot");
        if (p != NULL) {
 # ifdef CONFIG_AUTOBOOT_KEYED
                int prev = disable_ctrlc(1);    /* disable Control C checking */
@@ -78,20 +36,33 @@ void main_loop(void)
 # endif
        }
 #endif /* CONFIG_PREBOOT */
+}
+
+/* We come here after U-Boot is initialised and ready to process commands */
+void main_loop(void)
+{
+       const char *s;
+
+       bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
+
+#ifdef CONFIG_VERSION_VARIABLE
+       env_set("ver", version_string);  /* set version variable */
+#endif /* CONFIG_VERSION_VARIABLE */
+
+       cli_init();
+
+       run_preboot_environment_command();
 
 #if defined(CONFIG_UPDATE_TFTP)
-       update_tftp(0UL);
+       update_tftp(0UL, NULL, NULL);
 #endif /* CONFIG_UPDATE_TFTP */
 
-       bootdelay_process();
-       /*
-        * Main Loop for Monitor Command Processing
-        */
-#ifdef CONFIG_SYS_HUSH_PARSER
-       parse_file_outer();
-       /* This point is never reached */
-       for (;;);
-#else
+       s = bootdelay_process();
+       if (cli_process_fdt(&s))
+               cli_secure_boot_cmd(s);
+
+       autoboot_command(s);
+
        cli_loop();
-#endif /*CONFIG_SYS_HUSH_PARSER*/
+       panic("No CLI available");
 }