diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
| commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
| tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /arch/powerpc/cpu | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
| download | u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.gz | |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
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 843f2df649e..8d531898bd8 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 840f907acb8..e6dcb8a3350 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 4ea7b27ef41..3393ad562e8 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 05380674dc7..f9486678af3 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 d057cd6351c..5c289d00226 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 785d4805a46..84797c871c9 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 aeff007fb06..a861e8dd2dd 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 5c14aa1f32e..58e197f1208 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 2c61f2b81db..00cb2bd044e 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 ea8bc6c1528..22e451c58d6 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 95215a0b829..8e8427a08bb 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 3ff1ef45658..5170610f041 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 c519e8bd4b0..4195ecc5c98 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 0d8353ceb26..7d168e3c9a0 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 8822cf29fef..653efe09f93 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 a5c418570fa..a2505d1ffc1 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 773ae08dd3b..09653c70125 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 4465ae7565a..973b6fbe4b7 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 db6ed1fc92e..def47285ba3 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 9f5bce3992b..98b42bff7a3 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 a17091d2ff8..73779f862c2 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 010b6d4fe60..1313d8adde6 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 08d11ad4f2e..e6795e06c98 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 50014458622..86c1709c4ca 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 3ee0ec859cf..46006ece416 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 7c93e35003f..893aecef21c 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 226e258f0ea..b4a26efe302 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 e5b62e9f4ac..40793c26e12 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 77d4f8e47f7..ad3d3f9101c 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 b2d1dc5b481..eda64861ee6 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 e388386ad42..cf03f410190 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 7dd71d2e0c4..d917e9dfb62 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; |