Merge branch '2019-10-28-azure-ci-support'

[oweals/u-boot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index b4cf289dc5dfcae2c72c1c86848b981ce9b1d879..3a657c3d9a3918f1a9e3782bbbd0e2fb8a260443 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* #define     DEBUG   */
@@ -10,90 +9,57 @@
 #include <common.h>
 #include <autoboot.h>
 #include <cli.h>
-#include <cli_hush.h>
-#include <malloc.h>
+#include <console.h>
+#include <env.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")));
-
-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"));
-               setenv("preboot", str);  /* set or delete definition */
-               if (str != NULL)
-                       free(str);
-               mdm_init(); /* wait for modem connection */
-       }
-#endif  /* CONFIG_MODEM_SUPPORT */
-}
+__weak void show_boot_progress(int val) {}
 
 static void run_preboot_environment_command(void)
 {
-#ifdef CONFIG_PREBOOT
        char *p;
 
-       p = getenv("preboot");
+       p = env_get("preboot");
        if (p != NULL) {
-# ifdef CONFIG_AUTOBOOT_KEYED
-               int prev = disable_ctrlc(1);    /* disable Control C checking */
-# endif
+               int prev = 0;
+
+               if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
+                       prev = disable_ctrlc(1); /* disable Ctrl-C checking */
 
                run_command_list(p, -1, 0);
 
-# ifdef CONFIG_AUTOBOOT_KEYED
-               disable_ctrlc(prev);    /* restore Control C checking */
-# endif
+               if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
+                       disable_ctrlc(prev);    /* restore Ctrl-C checking */
        }
-#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 */
-
-#ifdef CONFIG_SYS_HUSH_PARSER
-       u_boot_hush_start();
-#endif
-
-#if defined(CONFIG_HUSH_INIT_VAR)
-       hush_init_var();
-#endif
-
-       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
+       if (IS_ENABLED(CONFIG_VERSION_VARIABLE))
+               env_set("ver", version_string);  /* set version variable */
+
+       cli_init();
+
+       if (IS_ENABLED(CONFIG_USE_PREBOOT))
+               run_preboot_environment_command();
+
+       if (IS_ENABLED(CONFIG_UPDATE_TFTP))
+               update_tftp(0UL, NULL, NULL);
+
+       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");
 }