leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Simon Glass 2017-05-17 08:22:56 -06:00 committed by Tom Rini
parent 587b6226aa
commit 3ff240c92f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/include/asm/u-boot-x86.h
View File

@ -8,13 +8,15 @@
#ifndef _U_BOOT_I386_H_ #ifndef _U_BOOT_I386_H_
#define _U_BOOT_I386_H_ 1 #define _U_BOOT_I386_H_ 1
struct global_data;
extern char gdt_rom[]; extern char gdt_rom[];
/* cpu/.../cpu.c */ /* cpu/.../cpu.c */
int arch_cpu_init(void); int arch_cpu_init(void);
int x86_cpu_init_f(void); int x86_cpu_init_f(void);
int 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 * Setup FSP execution environment GDT to use the one we used in
* arch/x86/cpu/start16.S and reload the segment registers. * arch/x86/cpu/start16.S and reload the segment registers.

3
include/common.h
View File

@ -430,9 +430,6 @@ static inline int setenv_addr(const char *varname, const void *addr)
# include <asm/setup.h> # include <asm/setup.h>
# include <asm/u-boot.h> # include <asm/u-boot.h>
#endif /* CONFIG_ARM */ #endif /* CONFIG_ARM */
#ifdef CONFIG_X86
# include <asm/u-boot.h>
#endif /* CONFIG_X86 */
#ifdef CONFIG_NDS32 #ifdef CONFIG_NDS32
# include <asm/mach-types.h> # include <asm/mach-types.h>
# include <asm/setup.h> # include <asm/setup.h>