Merge branch 'tx28-bugfix' into karo-devel

[karo-tx-uboot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index c4ed846c3b249b951e7bde1f0f0e7e49f95a63f0..2979fbed630ca22d7ae9a208c18a06ab1a3e21f0 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -10,61 +10,33 @@
 #include <common.h>
 #include <autoboot.h>
 #include <cli.h>
-#include <cli_hush.h>
-#include <malloc.h>
 #include <version.h>
 
+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")));
-
-#ifdef CONFIG_MODEM_SUPPORT
-int do_mdm_init = 0;
-extern void mdm_init(void); /* defined in board.c */
-#endif
+__weak void show_boot_progress(int val) {}
 
-void main_loop(void)
+static void modem_init(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"));
+       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 */
-               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
-
+static void run_preboot_environment_command(void)
+{
 #ifdef CONFIG_PREBOOT
+       char *p;
+
        p = getenv("preboot");
        if (p != NULL) {
 # ifdef CONFIG_AUTOBOOT_KEYED
@@ -78,20 +50,39 @@ 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");
+
+#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
+
+       modem_init();
+#ifdef CONFIG_VERSION_VARIABLE
+       setenv("ver", version_string);  /* set version variable */
+#endif /* CONFIG_VERSION_VARIABLE */
+
+       cli_init();
+
+       run_preboot_environment_command();
 
 #if defined(CONFIG_UPDATE_TFTP)
        update_tftp(0UL);
 #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*/
 }