Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / x86 / cpu / x86_64 / cpu.c

diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c
index cafae15af0c6fadd0ef9d5b2ad5998b460e42cba..1b4d3971b04311df036b4cfbb4fc7480aa859a60 100644 (file)
--- a/arch/x86/cpu/x86_64/cpu.c
+++ b/arch/x86/cpu/x86_64/cpu.c
@@ -1,39 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2016 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <debug_uart.h>
+#include <init.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-/* Global declaration of gd */
-struct global_data *global_data_ptr;
+/*
+ * Global declaration of gd.
+ *
+ * As we write to it before relocation we have to make sure it is not put into
+ * a .bss section which may overlap a .rela section. Initialization forces it
+ * into a .data section which cannot overlap any .rela section.
+ */
+struct global_data *global_data_ptr = (struct global_data *)~0;
 
 void arch_setup_gd(gd_t *new_gd)
 {
        global_data_ptr = new_gd;
-
-       /*
-        * TODO(sjg@chromium.org): For some reason U-Boot does not boot
-        * without this line. It fails to start up U-Boot proper and instead
-        * restarts SPL. Need to figure out why:
-        *
-        * U-Boot SPL 2017.01
-        *
-        * U-Boot SPL 2017.01
-        * CPU:   Intel(R) Core(TM) i5-3427U CPU @ 1.80GHz
-        * Trying to boot from SPIJumping to 64-bit U-Boot: Note many
-        * features are missing
-        *
-        * U-Boot SPL 2017.01
-        */
-#ifdef CONFIG_DEBUG_UART
-       printch(' ');
-#endif
 }
 
 int cpu_has_64bit(void)
@@ -67,6 +54,7 @@ int misc_init_r(void)
        return 0;
 }
 
+#ifndef CONFIG_SYS_COREBOOT
 int checkcpu(void)
 {
        return 0;
@@ -76,3 +64,9 @@ int print_cpuinfo(void)
 {
        return 0;
 }
+#endif
+
+int x86_cpu_reinit_f(void)
+{
+       return 0;
+}