From: Simon Glass <sjg@chromium.org>
Date: Wed, 17 May 2017 14:22:56 +0000 (-0600)
Subject: x86: Don't include asm/u-boot.h in common
X-Git-Tag: v2017.07-rc1~53
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3ff240c92f516841d8aff3b7d9268763711f2afd;p=oweals%2Fu-boot.git

x86: Don't include asm/u-boot.h in common

With a small fixup to u-boot-x86.h, this is not actually needed anywhere,
so drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index d55455f2d0..187fe5fd8c 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -8,13 +8,15 @@
 #ifndef _U_BOOT_I386_H_
 #define _U_BOOT_I386_H_	1
 
+struct global_data;
+
 extern char gdt_rom[];
 
 /* cpu/.../cpu.c */
 int arch_cpu_init(void);
 int x86_cpu_init_f(void);
 int cpu_init_f(void);
-void setup_gdt(gd_t *id, u64 *gdt_addr);
+void setup_gdt(struct global_data *id, u64 *gdt_addr);
 /*
  * Setup FSP execution environment GDT to use the one we used in
  * arch/x86/cpu/start16.S and reload the segment registers.
diff --git a/include/common.h b/include/common.h
index e0fbe6b3bf..02fda57f85 100644
--- a/include/common.h
+++ b/include/common.h
@@ -430,9 +430,6 @@ static inline int setenv_addr(const char *varname, const void *addr)
 # include <asm/setup.h>
 # include <asm/u-boot.h>
 #endif /* CONFIG_ARM */
-#ifdef CONFIG_X86
-# include <asm/u-boot.h>
-#endif /* CONFIG_X86 */
 #ifdef CONFIG_NDS32
 # include <asm/mach-types.h>
 # include <asm/setup.h>