vbe: Move OS implementation into a separate file

[platform/kernel/u-boot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 07b34bf..682f335 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -8,18 +8,18 @@
 
 #include <common.h>
 #include <autoboot.h>
+#include <bootstage.h>
 #include <cli.h>
+#include <command.h>
 #include <console.h>
-#include <version.h>
-
-/*
- * Board-specific Platform code can reimplement show_boot_progress () if needed
- */
-__weak void show_boot_progress(int val) {}
+#include <env.h>
+#include <init.h>
+#include <net.h>
+#include <version_string.h>
+#include <efi_loader.h>
 
 static void run_preboot_environment_command(void)
 {
-#ifdef CONFIG_PREBOOT
        char *p;
 
        p = env_get("preboot");
@@ -34,7 +34,6 @@ static void run_preboot_environment_command(void)
                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 */
@@ -49,11 +48,18 @@ void main_loop(void)
 
        cli_init();
 
-       run_preboot_environment_command();
+       if (IS_ENABLED(CONFIG_USE_PREBOOT))
+               run_preboot_environment_command();
 
        if (IS_ENABLED(CONFIG_UPDATE_TFTP))
                update_tftp(0UL, NULL, NULL);
 
+       if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK_EARLY)) {
+               /* efi_init_early() already called */
+               if (efi_init_obj_list() == EFI_SUCCESS)
+                       efi_launch_capsules();
+       }
+
        s = bootdelay_process();
        if (cli_process_fdt(&s))
                cli_secure_boot_cmd(s);