diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-30 20:40:48 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-06 15:07:48 -0600 |
| commit | 6a7185887b83a5cc334c7ce5bd65970381b2f4ce (patch) | |
| tree | b24fe505f1ec074073b0ff9d545a3a55b290a495 /arch/x86 | |
| parent | 7410cde67de051ba6e7650ed6d714fb6b132c3f4 (diff) | |
| download | u-boot-6a7185887b83a5cc334c7ce5bd65970381b2f4ce.zip u-boot-6a7185887b83a5cc334c7ce5bd65970381b2f4ce.tar.gz u-boot-6a7185887b83a5cc334c7ce5bd65970381b2f4ce.tar.bz2 | |
global: Make <asm/global_data.h> include <asm/u-boot.h>
This follows the example of RISC-V where <asm/global_data.h> includes
<asm/u-boot.h> directly as "gd" includes a reference to bd_info already
and so the first must include the second anyhow. We then remove
<asm/u-boot.h> from all of the places which include references to "gd"
an so have <asm/global_data.h> already.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/cpu/coreboot/sdram.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/efi/payload.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/efi/sdram.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/ivybridge/sdram_nop.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/dram.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/quark/dram.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/tangier/sdram.c | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 1 |
8 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index ee0491e..013225f 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -9,7 +9,6 @@ #include <asm/e820.h> #include <asm/cb_sysinfo.h> #include <asm/global_data.h> -#include <asm/u-boot.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index cb57f15..642a87a 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -16,7 +16,6 @@ #include <asm/e820.h> #include <asm/global_data.h> #include <asm/post.h> -#include <asm/u-boot.h> #include <asm/u-boot-x86.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c index 1f0e877..6fe4007 100644 --- a/arch/x86/cpu/efi/sdram.c +++ b/arch/x86/cpu/efi/sdram.c @@ -6,7 +6,6 @@ #include <efi.h> #include <init.h> #include <asm/global_data.h> -#include <asm/u-boot.h> #include <asm/u-boot-x86.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c index e7ec35b..d20c9a2 100644 --- a/arch/x86/cpu/ivybridge/sdram_nop.c +++ b/arch/x86/cpu/ivybridge/sdram_nop.c @@ -5,7 +5,6 @@ #include <init.h> #include <asm/global_data.h> -#include <asm/u-boot.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index 6ac363f..62a301c 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -7,7 +7,6 @@ #include <asm/global_data.h> #include <asm/post.h> #include <asm/arch/qemu.h> -#include <asm/u-boot.h> #include <linux/sizes.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index 7d32b98..34e5769 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -17,7 +17,6 @@ #include <asm/arch/mrc.h> #include <asm/arch/msg_port.h> #include <asm/arch/quark.h> -#include <asm/u-boot.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c index 7e1d290..6192f22 100644 --- a/arch/x86/cpu/tangier/sdram.c +++ b/arch/x86/cpu/tangier/sdram.c @@ -8,7 +8,6 @@ #include <asm/e820.h> #include <asm/global_data.h> #include <asm/sfi.h> -#include <asm/u-boot.h> #include <linux/printk.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 1ef7f1f..06bd80c 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -12,6 +12,7 @@ #include <linux/types.h> #include <asm/processor.h> #include <asm/mrccache.h> +#include <asm/u-boot.h> enum pei_boot_mode_t { PEI_BOOT_NONE = 0, |