diff options
author | Tom Rini <trini@konsulko.com> | 2021-02-15 16:19:40 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-02-15 18:16:45 +0300 |
commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /arch/powerpc/cpu/mpc85xx | |
parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
download | u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.xz |
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/mpc85xx')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/commproc.c | 1 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu.c | 1 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 1 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/fdt.c | 1 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/mp.c | 1 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/serial_scc.c | 1 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/speed.c | 1 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/tlb.c | 1 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/traps.c | 1 |
9 files changed, 9 insertions, 0 deletions
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> |