hash: Export the function to show a hash

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

diff --git a/common/main.c b/common/main.c
index 8c846c84c804a7e9e561bee292ab745580858847..32618f139f2e601ff804e3057d4a185f151694f5 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -10,7 +10,6 @@
 #include <common.h>
 #include <autoboot.h>
 #include <cli.h>
-#include <malloc.h>
 #include <version.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -26,10 +25,9 @@ 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 = strdup(getenv("mdm_cmd"));
+               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 */
@@ -55,8 +53,11 @@ static void run_preboot_environment_command(void)
 #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
@@ -78,10 +79,11 @@ void main_loop(void)
        update_tftp(0UL);
 #endif /* CONFIG_UPDATE_TFTP */
 
-       bootdelay_process();
-       /*
-        * Main Loop for Monitor Command Processing
-        */
+       s = bootdelay_process();
+       if (cli_process_fdt(&s))
+               cli_secure_boot_cmd(s);
+
+       autoboot_command(s);
 
        cli_loop();
 }