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

[platform/kernel/u-boot.git] / arch / x86 / cpu / coreboot / coreboot.c

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 4c6ed0b..aaa5ae1 100644 (file)
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -6,15 +6,17 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
-#include <asm/arch/sysinfo.h>
+#include <asm/cb_sysinfo.h>
 #include <asm/arch/timestamp.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <dm/ofnode.h>
 
 int arch_cpu_init(void)
 {
@@ -26,7 +28,8 @@ int arch_cpu_init(void)
 
        timestamp_init();
 
-       return x86_cpu_init_f();
+       return IS_ENABLED(CONFIG_X86_RUN_64BIT) ? x86_cpu_reinit_f() :
+                x86_cpu_init_f();
 }
 
 int checkcpu(void)
@@ -39,7 +42,7 @@ int print_cpuinfo(void)
        return default_print_cpuinfo();
 }
 
-static void board_final_cleanup(void)
+static void board_final_init(void)
 {
        /*
         * Un-cache the ROM so the kernel has one
@@ -61,7 +64,7 @@ static void board_final_cleanup(void)
                mtrr_close(&state, true);
        }
 
-       if (!fdtdec_get_config_bool(gd->fdt_blob, "u-boot,no-apm-finalize")) {
+       if (!ofnode_conf_read_bool("u-boot,no-apm-finalize")) {
                /*
                 * Issue SMI to coreboot to lock down ME and registers
                 * when allowed via device tree
@@ -73,14 +76,11 @@ static void board_final_cleanup(void)
 
 int last_stage_init(void)
 {
-       if (gd->flags & GD_FLG_COLD_BOOT)
-               timestamp_add_to_bootstage();
-
        /* start usb so that usb keyboard can be used as input device */
        if (CONFIG_IS_ENABLED(USB_KEYBOARD))
                usb_init();
 
-       board_final_cleanup();
+       board_final_init();
 
        return 0;
 }