Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3ff240c92f516841d8aff3b7d9268763711f2afd

Authored by Simon Glass
Committed by Tom Rini
1 parent 587b6226aa
Exists in smarc_8mq_lf_v2020.04 and in 18 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 2 changed files with 3 additions and 4 deletions Side-by-side Diff

arch/x86/include/asm/u-boot-x86.h
Diff comments   View file @ 3ff240c
... ... @@ -8,13 +8,15 @@
8 8 #ifndef _U_BOOT_I386_H_
9 9 #define _U_BOOT_I386_H_ 1
10 10  
  11 +struct global_data;
  12 +
11 13 extern char gdt_rom[];
12 14  
13 15 /* cpu/.../cpu.c */
14 16 int arch_cpu_init(void);
15 17 int x86_cpu_init_f(void);
16 18 int cpu_init_f(void);
17   -void setup_gdt(gd_t *id, u64 *gdt_addr);
  19 +void setup_gdt(struct global_data *id, u64 *gdt_addr);
18 20 /*
19 21 * Setup FSP execution environment GDT to use the one we used in
20 22 * arch/x86/cpu/start16.S and reload the segment registers.
... ... @@ -430,9 +430,6 @@
430 430 # include <asm/setup.h>
431 431 # include <asm/u-boot.h>
432 432 #endif /* CONFIG_ARM */
433   -#ifdef CONFIG_X86
434   -# include <asm/u-boot.h>
435   -#endif /* CONFIG_X86 */
436 433 #ifdef CONFIG_NDS32
437 434 # include <asm/mach-types.h>
438 435 # include <asm/setup.h>