diff options
| author | Simon Glass <sjg@chromium.org> | 2020-10-30 21:38:53 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-02 15:33:42 -0500 |
| commit | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (patch) | |
| tree | 0122abb2a3f1ea9837eaccc6150d2dae9570388e /arch/powerpc/cpu | |
| parent | fdcb93e1709ab1a2ebb562455621617c29e2099c (diff) | |
| download | u-boot-401d1c4f5d2d29c4bc4beaec95402ca23eb63295.tar.gz | |
common: Drop asm/global_data.h from common headerWIP/2021-02-02-drop-asm_global_data-when-unused
Move this out of the common header and include it only where needed. In
a number of cases this requires adding "struct udevice;" to avoid adding
another large header or in other cases replacing / adding missing header
files that had been pulled in, very indirectly. Finally, we have a few
cases where we did not need to include <asm/global_data.h> at all, so
remove that include.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/powerpc/cpu')
32 files changed, 32 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 843f2df649..8d531898bd 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -18,6 +18,7 @@ #include <watchdog.h> #include <command.h> #include <mpc83xx.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <linux/delay.h> #include <linux/libfdt.h> diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index 840f907acb..e6dcb8a335 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -7,6 +7,7 @@ #include <asm-offsets.h> #include <mpc83xx.h> #include <ioports.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/processor.h> #include <fsl_qe.h> diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c index 4ea7b27ef4..3393ad562e 100644 --- a/arch/powerpc/cpu/mpc83xx/fdt.c +++ b/arch/powerpc/cpu/mpc83xx/fdt.c @@ -8,6 +8,7 @@ #include <common.h> #include <clock_legacy.h> +#include <asm/global_data.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c index 05380674dc..f9486678af 100644 --- a/arch/powerpc/cpu/mpc83xx/interrupts.c +++ b/arch/powerpc/cpu/mpc83xx/interrupts.c @@ -10,6 +10,7 @@ #include <command.h> #include <irq_func.h> #include <mpc83xx.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <asm/ptrace.h> diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index d057cd6351..5c289d0022 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -10,6 +10,7 @@ #include <init.h> #include <pci.h> #include <asm/bitops.h> +#include <asm/global_data.h> #include <linux/delay.h> #if defined(CONFIG_OF_LIBFDT) diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c index 785d4805a4..84797c871c 100644 --- a/arch/powerpc/cpu/mpc83xx/pcie.c +++ b/arch/powerpc/cpu/mpc83xx/pcie.c @@ -10,6 +10,7 @@ #include <common.h> #include <pci.h> #include <mpc83xx.h> +#include <asm/global_data.h> #include <asm/io.h> #include <linux/delay.h> diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index aeff007fb0..a861e8dd2d 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -24,6 +24,7 @@ #include <asm/mmu.h> #include <spd_sdram.h> #include <asm/bitops.h> +#include <asm/global_data.h> #include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c index 5c14aa1f32..58e197f120 100644 --- a/arch/powerpc/cpu/mpc83xx/speed.c +++ b/arch/powerpc/cpu/mpc83xx/speed.c @@ -13,6 +13,7 @@ #include <mpc83xx.h> #include <command.h> #include <vsprintf.h> +#include <asm/global_data.h> #include <asm/processor.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c index 2c61f2b81d..00cb2bd044 100644 --- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c +++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c @@ -8,6 +8,7 @@ #include <clock_legacy.h> #include <mpc83xx.h> #include <time.h> +#include <asm/global_data.h> #include "lblaw/lblaw.h" #include "elbc/elbc.h" diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c index ea8bc6c152..22e451c58d 100644 --- a/arch/powerpc/cpu/mpc83xx/traps.c +++ b/arch/powerpc/cpu/mpc83xx/traps.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <asm/global_data.h> #include <asm/ptrace.h> #include <command.h> #include <kgdb.h> diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c index 95215a0b82..8e8427a08b 100644 --- a/arch/powerpc/cpu/mpc85xx/commproc.c +++ b/arch/powerpc/cpu/mpc85xx/commproc.c @@ -24,6 +24,7 @@ #include <common.h> #include <asm-offsets.h> #include <asm/cpm_85xx.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 3ff1ef4565..5170610f04 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -20,6 +20,7 @@ #include <command.h> #include <fsl_esdhc.h> #include <asm/cache.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/mmu.h> #include <fsl_ifc.h> diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index c519e8bd4b..4195ecc5c9 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c @@ -5,6 +5,7 @@ #include <common.h> #include <asm-offsets.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/fsl_law.h> diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 0d8353ceb2..7d168e3c9a 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -11,6 +11,7 @@ #include <env.h> #include <log.h> #include <time.h> +#include <asm/global_data.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c index 8822cf29fe..653efe09f9 100644 --- a/arch/powerpc/cpu/mpc85xx/mp.c +++ b/arch/powerpc/cpu/mpc85xx/mp.c @@ -7,6 +7,7 @@ #include <cpu_func.h> #include <env.h> #include <log.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <env.h> #include <ioports.h> diff --git a/arch/powerpc/cpu/mpc85xx/serial_scc.c b/arch/powerpc/cpu/mpc85xx/serial_scc.c index a5c418570f..a2505d1ffc 100644 --- a/arch/powerpc/cpu/mpc85xx/serial_scc.c +++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c @@ -18,6 +18,7 @@ #include <common.h> #include <asm/cpm_85xx.h> #include <serial.h> +#include <asm/global_data.h> #include <linux/compiler.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 773ae08dd3..09653c7012 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -12,6 +12,7 @@ #include <common.h> #include <cpu_func.h> #include <ppc_asm.tmpl> +#include <asm/global_data.h> #include <linux/compiler.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 4465ae7565..973b6fbe4b 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -8,6 +8,7 @@ #include <common.h> #include <asm/bitops.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <asm/mmu.h> #ifdef CONFIG_ADDR_MAP diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c index db6ed1fc92..def47285ba 100644 --- a/arch/powerpc/cpu/mpc85xx/traps.c +++ b/arch/powerpc/cpu/mpc85xx/traps.c @@ -20,6 +20,7 @@ */ #include <common.h> +#include <asm/global_data.h> #include <asm/ptrace.h> #include <command.h> #include <init.h> diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index 9f5bce3992..98b42bff7a 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -13,6 +13,7 @@ #include <watchdog.h> #include <command.h> #include <asm/cache.h> +#include <asm/global_data.h> #include <asm/mmu.h> #include <mpc86xx.h> #include <asm/fsl_law.h> diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c index a17091d2ff..73779f862c 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c @@ -14,6 +14,7 @@ #include <common.h> #include <init.h> #include <mpc86xx.h> +#include <asm/global_data.h> #include <asm/mmu.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index 010b6d4fe6..1313d8adde 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm/global_data.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/mp.h> diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c index 08d11ad4f2..e6795e06c9 100644 --- a/arch/powerpc/cpu/mpc86xx/mp.c +++ b/arch/powerpc/cpu/mpc86xx/mp.c @@ -5,6 +5,7 @@ #include <common.h> #include <cpu_func.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <asm/mmu.h> #include <ioports.h> diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c index 5001445862..86c1709c4c 100644 --- a/arch/powerpc/cpu/mpc86xx/speed.c +++ b/arch/powerpc/cpu/mpc86xx/speed.c @@ -11,6 +11,7 @@ #include <common.h> #include <clock_legacy.h> #include <mpc86xx.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c index 3ee0ec859c..46006ece41 100644 --- a/arch/powerpc/cpu/mpc86xx/traps.c +++ b/arch/powerpc/cpu/mpc86xx/traps.c @@ -14,6 +14,7 @@ */ #include <common.h> +#include <asm/global_data.h> #include <asm/ptrace.h> #include <command.h> #include <init.h> diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 7c93e35003..893aecef21 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -27,6 +27,7 @@ #include <netdev.h> #include <asm/cache.h> #include <asm/cpm_8xx.h> +#include <asm/global_data.h> #include <linux/compiler.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c index 226e258f0e..b4a26efe30 100644 --- a/arch/powerpc/cpu/mpc8xx/fdt.c +++ b/arch/powerpc/cpu/mpc8xx/fdt.c @@ -7,6 +7,7 @@ #include <common.h> #include <time.h> +#include <asm/global_data.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c index e5b62e9f4a..40793c26e1 100644 --- a/arch/powerpc/cpu/mpc8xx/immap.c +++ b/arch/powerpc/cpu/mpc8xx/immap.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> +#include <asm/global_data.h> #include <asm/immap_8xx.h> #include <asm/cpm_8xx.h> diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c index 77d4f8e47f..ad3d3f9101 100644 --- a/arch/powerpc/cpu/mpc8xx/speed.c +++ b/arch/powerpc/cpu/mpc8xx/speed.c @@ -7,6 +7,7 @@ #include <common.h> #include <clock_legacy.h> #include <mpc8xx.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index b2d1dc5b48..eda64861ee 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -17,6 +17,7 @@ #include <fm_eth.h> #include <netdev.h> #include <asm/cache.h> +#include <asm/global_data.h> #include <asm/io.h> #include <vsc9953.h> diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index e388386ad4..cf03f41019 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -8,6 +8,7 @@ #include <common.h> #include <asm/bitops.h> +#include <asm/global_data.h> #include <linux/compiler.h> #include <asm/fsl_law.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c index 7dd71d2e0c..d917e9dfb6 100644 --- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c +++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c @@ -6,6 +6,7 @@ #include <common.h> #include <log.h> #include <asm/fsl_pamu.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; |