Merge tag 'u-boot-stm32-20211012' of https://source.denx.de/u-boot/custodians/u-boot-stm

[platform/kernel/u-boot.git] / board / google / chromebook_coral / coral.c

diff --git a/board/google/chromebook_coral/coral.c b/board/google/chromebook_coral/coral.c
index 3f9235c..53c5171 100644 (file)
--- a/board/google/chromebook_coral/coral.c
+++ b/board/google/chromebook_coral/coral.c
@@ -10,17 +10,21 @@
 #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;
@@ -272,7 +300,7 @@ struct sysinfo_ops coral_sysinfo_ops = {
        .get_str        = coral_get_str,
 };
 
-#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+#if CONFIG_IS_ENABLED(OF_REAL)
 static const struct udevice_id coral_ids[] = {
        { .compatible = "google,coral" },
        { }