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/arm/cpu/armv7 | |
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/arm/cpu/armv7')
-rw-r--r-- | arch/arm/cpu/armv7/arch_timer.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/ls102xa/clock.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/ls102xa/cpu.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/ls102xa/fdt.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/ls102xa/timer.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/s5p-common/cpu_info.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/s5p-common/timer.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/s5p4418/cpu.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/stv0991/timer.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/timer.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/vf610/generic.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/vf610/timer.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/virt-dt.c | 1 |
13 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c index 871629c233..d96406f762 100644 --- a/arch/arm/cpu/armv7/arch_timer.c +++ b/arch/arm/cpu/armv7/arch_timer.c @@ -7,6 +7,7 @@ #include <common.h> #include <init.h> #include <time.h> +#include <asm/global_data.h> #include <asm/io.h> #include <div64.h> #include <bootstage.h> diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c index f3bdb14c07..940995ef5a 100644 --- a/arch/arm/cpu/armv7/ls102xa/clock.c +++ b/arch/arm/cpu/armv7/ls102xa/clock.c @@ -5,6 +5,7 @@ #include <common.h> #include <clock_legacy.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/immap_ls102xa.h> #include <asm/arch/clock.h> diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index c6a39aa341..f26a5b22fd 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -9,6 +9,7 @@ #include <net.h> #include <vsprintf.h> #include <asm/arch/clock.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/immap_ls102xa.h> #include <asm/cache.h> diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index 2556980cde..0daf8234fb 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -6,6 +6,7 @@ #include <common.h> #include <clock_legacy.h> #include <net.h> +#include <asm/global_data.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index 2a32b30999..d79bf105f1 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -6,6 +6,7 @@ #include <common.h> #include <init.h> #include <time.h> +#include <asm/global_data.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/immap_ls102xa.h> diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c index 7790f087a0..d910282e2b 100644 --- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c +++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c @@ -6,6 +6,7 @@ #include <common.h> #include <fdtdec.h> #include <init.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/clk.h> diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 3064fd25d4..8141f40d5c 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -10,6 +10,7 @@ #include <div64.h> #include <init.h> #include <time.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/pwm.h> #include <asm/arch/clk.h> diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c index 8add9474ad..3c71a37a74 100644 --- a/arch/arm/cpu/armv7/s5p4418/cpu.c +++ b/arch/arm/cpu/armv7/s5p4418/cpu.c @@ -8,6 +8,7 @@ #include <command.h> #include <asm/system.h> #include <asm/cache.h> +#include <asm/global_data.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/arch/nexell.h> diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c index 919529aa1b..07033acb5c 100644 --- a/arch/arm/cpu/armv7/stv0991/timer.c +++ b/arch/arm/cpu/armv7/stv0991/timer.c @@ -7,6 +7,7 @@ #include <common.h> #include <init.h> #include <time.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch-stv0991/hardware.h> #include <asm/arch-stv0991/stv0991_cgu.h> diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c index 65b64b5ac7..b758599636 100644 --- a/arch/arm/cpu/armv7/sunxi/timer.c +++ b/arch/arm/cpu/armv7/sunxi/timer.c @@ -8,6 +8,7 @@ #include <common.h> #include <init.h> #include <time.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/timer.h> #include <linux/delay.h> diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c index 743bfced64..c23ddc12b4 100644 --- a/arch/arm/cpu/armv7/vf610/generic.c +++ b/arch/arm/cpu/armv7/vf610/generic.c @@ -10,6 +10,7 @@ #include <init.h> #include <net.h> #include <asm/cache.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c index fa8f8fae10..a9c1a8fceb 100644 --- a/arch/arm/cpu/armv7/vf610/timer.c +++ b/arch/arm/cpu/armv7/vf610/timer.c @@ -6,6 +6,7 @@ #include <common.h> #include <init.h> #include <time.h> +#include <asm/global_data.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/imx-regs.h> diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c index 61c82f6469..c0422485ba 100644 --- a/arch/arm/cpu/armv7/virt-dt.c +++ b/arch/arm/cpu/armv7/virt-dt.c @@ -21,7 +21,6 @@ #include <stdio_dev.h> #include <linux/ctype.h> #include <linux/types.h> -#include <asm/global_data.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <asm/armv7.h> |