diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-17 08:22:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-05 11:02:35 -0400 |
| commit | 3ff240c92f516841d8aff3b7d9268763711f2afd (patch) | |
| tree | 711052c15b6862232e6f0c771699c2454c494f94 | |
| parent | 587b6226aa1f52a0c679443b0d1a3c9445fe39aa (diff) | |
| download | u-boot-3ff240c92f516841d8aff3b7d9268763711f2afd.tar.gz | |
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>
| -rw-r--r-- | arch/x86/include/asm/u-boot-x86.h | 4 | ||||
| -rw-r--r-- | include/common.h | 3 |
2 files changed, 3 insertions, 4 deletions
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> |