diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
| commit | ab14a2f6d4f1c819ccf00226ddbd39a2f60dc730 (patch) | |
| tree | 3a5ab5828ba7e123f6ac6be3d5328859f4592d1d /arch/x86/lib | |
| parent | 32a730ef068577bdb3152ac722c5c51db087750a (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
| download | u-boot-WIP/15Feb2021.zip u-boot-WIP/15Feb2021.tar.gz u-boot-WIP/15Feb2021.tar.bz2 | |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'WIP/15Feb2021
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'arch/x86/lib')
27 files changed, 27 insertions, 0 deletions
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c index 52410a5..2c70acb 100644 --- a/arch/x86/lib/acpi_s3.c +++ b/arch/x86/lib/acpi_s3.c @@ -7,6 +7,7 @@ #include <acpi/acpi_s3.h> #include <acpi/acpi_table.h> #include <asm/acpi.h> +#include <asm/global_data.h> #include <asm/post.h> #include <linux/linkage.h> diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 9a41ecb..5ec3130 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -22,6 +22,7 @@ #include <acpi/acpi_table.h> #include <asm/acpi/global_nvs.h> #include <asm/ioapic.h> +#include <asm/global_data.h> #include <asm/lapic.h> #include <asm/mpspec.h> #include <asm/tables.h> diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c index 47b38cd..8df67db 100644 --- a/arch/x86/lib/asm-offsets.c +++ b/arch/x86/lib/asm-offsets.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <asm/global_data.h> #include <linux/kbuild.h> int main(void) diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index 3ab432e..fbdc3b0 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -6,6 +6,7 @@ * Copyright (C) 2009-2010 coresystems GmbH */ #include <common.h> +#include <compiler.h> #include <bios_emul.h> #include <irq_func.h> #include <log.h> diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index da6b8ce..aa5f0bf 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -12,6 +12,7 @@ #include <command.h> #include <hang.h> #include <log.h> +#include <asm/global_data.h> #include <dm/device.h> #include <dm/root.h> #include <errno.h> diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c index baaf3d1..4facbe5 100644 --- a/arch/x86/lib/cmd_boot.c +++ b/arch/x86/lib/cmd_boot.c @@ -17,6 +17,7 @@ #include <common.h> #include <command.h> #include <malloc.h> +#include <asm/global_data.h> #include <asm/u-boot-x86.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index 6cd3244..6eab045 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.c @@ -10,6 +10,7 @@ #include <acpi/acpi_s3.h> #include <asm/coreboot_tables.h> #include <asm/e820.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c index 1f20c5c..12fcff1 100644 --- a/arch/x86/lib/e820.c +++ b/arch/x86/lib/e820.c @@ -6,6 +6,7 @@ #include <common.h> #include <efi_loader.h> #include <asm/e820.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 4061fa2..6365b0a 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -13,6 +13,7 @@ #include <acpi/acpi_s3.h> #include <asm/cmos_layout.h> #include <asm/early_cmos.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/mrccache.h> #include <asm/post.h> diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index 3ffd40c..8ad9aee 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -9,6 +9,7 @@ #include <log.h> #include <asm/fsp/fsp_support.h> #include <asm/e820.h> +#include <asm/global_data.h> #include <asm/mrccache.h> #include <asm/mtrr.h> #include <asm/post.h> diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index a029237..cc909e0 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -13,6 +13,7 @@ #include <video.h> #include <acpi/acpi_table.h> #include <asm/fsp/fsp_support.h> +#include <asm/global_data.h> #include <asm/intel_opregion.h> #include <asm/mtrr.h> #include <dm/acpi.h> diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c index da351cf..2092617 100644 --- a/arch/x86/lib/fsp1/fsp_common.c +++ b/arch/x86/lib/fsp1/fsp_common.c @@ -13,6 +13,7 @@ #include <acpi/acpi_s3.h> #include <asm/cmos_layout.h> #include <asm/early_cmos.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/mrccache.h> #include <asm/post.h> diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c index e3f9e30..cfd9b9f 100644 --- a/arch/x86/lib/fsp1/fsp_dram.c +++ b/arch/x86/lib/fsp1/fsp_dram.c @@ -6,6 +6,7 @@ #include <common.h> #include <init.h> #include <asm/fsp/fsp_support.h> +#include <asm/global_data.h> int dram_init(void) { diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c index a95fdc4..42d3892 100644 --- a/arch/x86/lib/fsp2/fsp_dram.c +++ b/arch/x86/lib/fsp2/fsp_dram.c @@ -16,6 +16,7 @@ #include <asm/fsp/fsp_support.h> #include <asm/fsp2/fsp_api.h> #include <asm/fsp2/fsp_internal.h> +#include <asm/global_data.h> #include <linux/sizes.h> int dram_init(void) diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c index ce0b0af..022e2cb 100644 --- a/arch/x86/lib/fsp2/fsp_meminit.c +++ b/arch/x86/lib/fsp2/fsp_meminit.c @@ -11,6 +11,7 @@ #include <bootstage.h> #include <dm.h> #include <log.h> +#include <asm/global_data.h> #include <asm/mrccache.h> #include <asm/fsp/fsp_infoheader.h> #include <asm/fsp2/fsp_api.h> diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c index ead3493..a96d2b1 100644 --- a/arch/x86/lib/fsp2/fsp_silicon_init.c +++ b/arch/x86/lib/fsp2/fsp_silicon_init.c @@ -17,6 +17,7 @@ #include <asm/arch/fsp/fsp_s_upd.h> #include <asm/fsp/fsp_infoheader.h> #include <asm/fsp2/fsp_internal.h> +#include <asm/global_data.h> int fsp_silicon_init(bool s3wake, bool use_spi_flash) { diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c index f220ef4..503f97d 100644 --- a/arch/x86/lib/fsp2/fsp_support.c +++ b/arch/x86/lib/fsp2/fsp_support.c @@ -10,6 +10,7 @@ #include <spi_flash.h> #include <asm/fsp/fsp_support.h> #include <asm/fsp2/fsp_internal.h> +#include <asm/global_data.h> /* The amount of the FSP header to probe to obtain what we need */ #define PROBE_BUF_SIZE 0x180 diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index d906b52..066dc40 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -6,6 +6,7 @@ #include <common.h> #include <init.h> +#include <asm/global_data.h> #include <linux/errno.h> #include <asm/mtrr.h> diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index 562a27c..8e97d9f 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -12,6 +12,7 @@ #include <fdtdec.h> #include <log.h> #include <asm/cpu.h> +#include <asm/global_data.h> #include <asm/irq.h> #include <asm/ioapic.h> #include <asm/lapic.h> diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c index f181e81..b526915 100644 --- a/arch/x86/lib/mrccache.c +++ b/arch/x86/lib/mrccache.c @@ -15,6 +15,7 @@ #include <net.h> #include <spi.h> #include <spi_flash.h> +#include <asm/global_data.h> #include <asm/mrccache.h> #include <dm/device-internal.h> #include <dm/uclass-internal.h> diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c index 4578046..c11101b 100644 --- a/arch/x86/lib/physmem.c +++ b/arch/x86/lib/physmem.c @@ -12,6 +12,7 @@ #include <log.h> #include <physmem.h> #include <asm/cpu.h> +#include <asm/global_data.h> #include <linux/compiler.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c index 4825994..fd5e311 100644 --- a/arch/x86/lib/pinctrl_ich6.c +++ b/arch/x86/lib/pinctrl_ich6.c @@ -11,6 +11,7 @@ #include <pch.h> #include <pci.h> #include <asm/cpu.h> +#include <asm/global_data.h> #include <asm/gpio.h> #include <asm/io.h> #include <asm/pci.h> diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c index eb6a7d9..caeaec9 100644 --- a/arch/x86/lib/pirq_routing.c +++ b/arch/x86/lib/pirq_routing.c @@ -8,6 +8,7 @@ #include <common.h> #include <log.h> #include <pci.h> +#include <asm/global_data.h> #include <asm/pci.h> #include <asm/pirq_routing.h> diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index ecbd092..6fe5151 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -17,6 +17,7 @@ #include <common.h> #include <log.h> #include <relocate.h> +#include <asm/global_data.h> #include <asm/u-boot-x86.h> #include <asm/sections.h> #include <elf.h> diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 6699de4..1bae1f4 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -17,6 +17,7 @@ #include <syscon.h> #include <asm/cpu.h> #include <asm/cpu_common.h> +#include <asm/global_data.h> #include <asm/mrccache.h> #include <asm/mtrr.h> #include <asm/pci.h> diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index c4007fa..1779bb3 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -9,6 +9,7 @@ #include <malloc.h> #include <smbios.h> #include <acpi/acpi_table.h> +#include <asm/global_data.h> #include <asm/sfi.h> #include <asm/mpspec.h> #include <asm/tables.h> diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c index c84a0c9..ac6b6ef 100644 --- a/arch/x86/lib/tpl.c +++ b/arch/x86/lib/tpl.c @@ -12,6 +12,7 @@ #include <log.h> #include <spl.h> #include <asm/cpu.h> +#include <asm/global_data.h> #include <asm/mtrr.h> #include <asm/processor.h> #include <asm-generic/sections.h> |