]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
x86: coral: Allow booting from coreboot
authorSimon Glass <sjg@chromium.org>
Sun, 27 Jun 2021 23:51:05 +0000 (17:51 -0600)
committerBin Meng <bmeng.cn@gmail.com>
Thu, 15 Jul 2021 11:50:14 +0000 (19:50 +0800)
Set up coral so that it can boot from coreboot, even though it is a
bare-metal build. This helps with testing since the same image can be used
in both cases.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
board/google/chromebook_coral/coral.c

index 3f9235c903b789da3f1c9aad6dfc0b84a64ab713..85cba50d4e5c11cc50cffd11b1c688d9d5cd1c1a 100644 (file)
 #include <command.h>
 #include <cros_ec.h>
 #include <dm.h>
+#include <init.h>
 #include <log.h>
 #include <sysinfo.h>
 #include <acpi/acpigen.h>
 #include <asm-generic/gpio.h>
 #include <asm/acpi_nhlt.h>
+#include <asm/cb_sysinfo.h>
 #include <asm/intel_gnvs.h>
 #include <asm/intel_pinctrl.h>
 #include <dm/acpi.h>
 #include <linux/delay.h>
 #include "variant_gpio.h"
 
+DECLARE_GLOBAL_DATA_PTR;
+
 struct cros_gpio_info {
        const char *linux_name;
        enum cros_gpio_t type;
@@ -28,6 +32,30 @@ struct cros_gpio_info {
        int flags;
 };
 
+int misc_init_f(void)
+{
+       if (!ll_boot_init()) {
+               printf("Running as secondary loader");
+               if (gd->arch.coreboot_table) {
+                       int ret;
+
+                       printf(" (found coreboot table at %lx)",
+                              gd->arch.coreboot_table);
+
+                       ret = get_coreboot_info(&lib_sysinfo);
+                       if (ret) {
+                               printf("\nFailed to parse coreboot tables (err=%d)\n",
+                                      ret);
+                               return ret;
+                       }
+               }
+
+               printf("\n");
+       }
+
+       return 0;
+}
+
 int arch_misc_init(void)
 {
        return 0;