Skip to content

Commit 401d1c4

Browse files
sjg20trini
sjg20
authored and
trini
committed
common: Drop asm/global_data.h from common header
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 <[email protected]> Signed-off-by: Tom Rini <[email protected]>
1 parent fdcb93e commit 401d1c4

File tree

1,361 files changed

+1405
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,361 files changed

+1405
-23
lines changed

‎arch/arc/lib/bootm.c

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <lmb.h>
1212
#include <log.h>
1313
#include <asm/cache.h>
14+
#include <asm/global_data.h>
1415

1516
DECLARE_GLOBAL_DATA_PTR;
1617

‎arch/arc/lib/cache.c

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <config.h>
77
#include <common.h>
88
#include <cpu_func.h>
9+
#include <asm/global_data.h>
910
#include <linux/bitops.h>
1011
#include <linux/compiler.h>
1112
#include <linux/kernel.h>

‎arch/arc/lib/cpu.c

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <vsprintf.h>
1010
#include <asm/arcregs.h>
1111
#include <asm/cache.h>
12+
#include <asm/global_data.h>
1213
#include <linux/bitops.h>
1314

1415
DECLARE_GLOBAL_DATA_PTR;

‎arch/arc/lib/relocate.c

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <elf.h>
88
#include <log.h>
99
#include <asm-generic/sections.h>
10+
#include <asm/global_data.h>
1011

1112
extern ulong __image_copy_start;
1213
extern ulong __ivt_start;

‎arch/arm/cpu/arm1136/mx35/generic.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <div64.h>
1313
#include <init.h>
1414
#include <net.h>
15+
#include <asm/global_data.h>
1516
#include <asm/io.h>
1617
#include <linux/errno.h>
1718
#include <asm/arch/imx-regs.h>

‎arch/arm/cpu/arm926ejs/armada100/dram.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <common.h>
1010
#include <init.h>
11+
#include <asm/global_data.h>
1112
#include <asm/io.h>
1213
#include <asm/arch/armada100.h>
1314

‎arch/arm/cpu/arm926ejs/armada100/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <time.h>
1313
#include <asm/arch/cpu.h>
1414
#include <asm/arch/armada100.h>
15+
#include <asm/global_data.h>
1516
#include <linux/delay.h>
1617

1718
/*

‎arch/arm/cpu/arm926ejs/mx25/generic.c

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <net.h>
1616
#include <netdev.h>
1717
#include <vsprintf.h>
18+
#include <asm/global_data.h>
1819
#include <asm/io.h>
1920
#include <asm/arch-imx/cpu.h>
2021
#include <asm/arch/imx-regs.h>

‎arch/arm/cpu/arm926ejs/mx27/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <div64.h>
2020
#include <init.h>
2121
#include <time.h>
22+
#include <asm/global_data.h>
2223
#include <asm/io.h>
2324
#include <asm/arch/imx-regs.h>
2425
#include <asm/ptrace.h>

‎arch/arm/cpu/arm926ejs/mxs/mxs.c

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <hang.h>
1616
#include <init.h>
1717
#include <net.h>
18+
#include <asm/global_data.h>
1819
#include <linux/delay.h>
1920
#include <linux/errno.h>
2021
#include <asm/io.h>

‎arch/arm/cpu/arm926ejs/mxs/spl_boot.c

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <init.h>
1212
#include <log.h>
1313
#include <serial.h>
14+
#include <asm/global_data.h>
1415
#include <asm/io.h>
1516
#include <asm/arch/imx-regs.h>
1617
#include <asm/arch/sys_proto.h>

‎arch/arm/cpu/arm926ejs/mxs/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <common.h>
1313
#include <init.h>
1414
#include <time.h>
15+
#include <asm/global_data.h>
1516
#include <asm/io.h>
1617
#include <asm/arch/imx-regs.h>
1718
#include <asm/arch/sys_proto.h>

‎arch/arm/cpu/arm926ejs/spear/spr_misc.c

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <i2c.h>
1212
#include <init.h>
1313
#include <net.h>
14+
#include <asm/global_data.h>
1415
#include <linux/mtd/st_smi.h>
1516
#include <asm/io.h>
1617
#include <asm/arch/hardware.h>

‎arch/arm/cpu/arm926ejs/spear/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <common.h>
88
#include <init.h>
99
#include <time.h>
10+
#include <asm/global_data.h>
1011
#include <asm/io.h>
1112
#include <asm/arch/hardware.h>
1213
#include <asm/arch/spr_gpt.h>

‎arch/arm/cpu/armv7/arch_timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <common.h>
88
#include <init.h>
99
#include <time.h>
10+
#include <asm/global_data.h>
1011
#include <asm/io.h>
1112
#include <div64.h>
1213
#include <bootstage.h>

‎arch/arm/cpu/armv7/ls102xa/clock.c

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include <common.h>
77
#include <clock_legacy.h>
8+
#include <asm/global_data.h>
89
#include <asm/io.h>
910
#include <asm/arch/immap_ls102xa.h>
1011
#include <asm/arch/clock.h>

‎arch/arm/cpu/armv7/ls102xa/cpu.c

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <net.h>
1010
#include <vsprintf.h>
1111
#include <asm/arch/clock.h>
12+
#include <asm/global_data.h>
1213
#include <asm/io.h>
1314
#include <asm/arch/immap_ls102xa.h>
1415
#include <asm/cache.h>

‎arch/arm/cpu/armv7/ls102xa/fdt.c

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <common.h>
77
#include <clock_legacy.h>
88
#include <net.h>
9+
#include <asm/global_data.h>
910
#include <linux/libfdt.h>
1011
#include <fdt_support.h>
1112
#include <asm/io.h>

‎arch/arm/cpu/armv7/ls102xa/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <common.h>
77
#include <init.h>
88
#include <time.h>
9+
#include <asm/global_data.h>
910
#include <asm/io.h>
1011
#include <div64.h>
1112
#include <asm/arch/immap_ls102xa.h>

‎arch/arm/cpu/armv7/s5p-common/cpu_info.c

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <common.h>
77
#include <fdtdec.h>
88
#include <init.h>
9+
#include <asm/global_data.h>
910
#include <asm/io.h>
1011
#include <asm/arch/clk.h>
1112

‎arch/arm/cpu/armv7/s5p-common/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <div64.h>
1111
#include <init.h>
1212
#include <time.h>
13+
#include <asm/global_data.h>
1314
#include <asm/io.h>
1415
#include <asm/arch/pwm.h>
1516
#include <asm/arch/clk.h>

‎arch/arm/cpu/armv7/s5p4418/cpu.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <command.h>
99
#include <asm/system.h>
1010
#include <asm/cache.h>
11+
#include <asm/global_data.h>
1112
#include <asm/sections.h>
1213
#include <asm/io.h>
1314
#include <asm/arch/nexell.h>

‎arch/arm/cpu/armv7/stv0991/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <common.h>
88
#include <init.h>
99
#include <time.h>
10+
#include <asm/global_data.h>
1011
#include <asm/io.h>
1112
#include <asm/arch-stv0991/hardware.h>
1213
#include <asm/arch-stv0991/stv0991_cgu.h>

‎arch/arm/cpu/armv7/sunxi/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <common.h>
99
#include <init.h>
1010
#include <time.h>
11+
#include <asm/global_data.h>
1112
#include <asm/io.h>
1213
#include <asm/arch/timer.h>
1314
#include <linux/delay.h>

‎arch/arm/cpu/armv7/vf610/generic.c

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <init.h>
1111
#include <net.h>
1212
#include <asm/cache.h>
13+
#include <asm/global_data.h>
1314
#include <asm/io.h>
1415
#include <asm/arch/imx-regs.h>
1516
#include <asm/arch/clock.h>

‎arch/arm/cpu/armv7/vf610/timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <common.h>
77
#include <init.h>
88
#include <time.h>
9+
#include <asm/global_data.h>
910
#include <asm/io.h>
1011
#include <div64.h>
1112
#include <asm/arch/imx-regs.h>

‎arch/arm/cpu/armv7/virt-dt.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <stdio_dev.h>
2222
#include <linux/ctype.h>
2323
#include <linux/types.h>
24-
#include <asm/global_data.h>
2524
#include <linux/libfdt.h>
2625
#include <fdt_support.h>
2726
#include <asm/armv7.h>

‎arch/arm/cpu/armv7m/systick-timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <common.h>
2525
#include <init.h>
2626
#include <time.h>
27+
#include <asm/global_data.h>
2728
#include <asm/io.h>
2829
#include <linux/bitops.h>
2930

‎arch/arm/cpu/armv8/cache_v8.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <hang.h>
1313
#include <log.h>
1414
#include <asm/cache.h>
15+
#include <asm/global_data.h>
1516
#include <asm/system.h>
1617
#include <asm/armv8/mmu.h>
1718

‎arch/arm/cpu/armv8/fsl-layerscape/cpu.c

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <net.h>
1515
#include <vsprintf.h>
1616
#include <asm/cache.h>
17+
#include <asm/global_data.h>
1718
#include <asm/io.h>
1819
#include <asm/ptrace.h>
1920
#include <linux/errno.h>

‎arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <common.h>
88
#include <clock_legacy.h>
99
#include <cpu_func.h>
10+
#include <asm/global_data.h>
1011
#include <linux/compiler.h>
1112
#include <asm/io.h>
1213
#include <asm/processor.h>

‎arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <common.h>
1010
#include <clock_legacy.h>
1111
#include <cpu_func.h>
12+
#include <asm/global_data.h>
1213
#include <linux/compiler.h>
1314
#include <fsl_ifc.h>
1415
#include <asm/processor.h>

‎arch/arm/cpu/armv8/fsl-layerscape/mp.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <image.h>
99
#include <log.h>
1010
#include <asm/cache.h>
11+
#include <asm/global_data.h>
1112
#include <asm/io.h>
1213
#include <asm/system.h>
1314
#include <asm/arch/mp.h>

‎arch/arm/cpu/armv8/fsl-layerscape/ppa.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <config.h>
99
#include <errno.h>
1010
#include <asm/cache.h>
11+
#include <asm/global_data.h>
1112
#include <asm/system.h>
1213
#include <asm/types.h>
1314
#include <asm/arch/soc.h>

‎arch/arm/cpu/armv8/fsl-layerscape/spl.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <log.h>
1313
#include <spl.h>
1414
#include <asm/cache.h>
15+
#include <asm/global_data.h>
1516
#include <asm/io.h>
1617
#include <fsl_ifc.h>
1718
#include <i2c.h>

‎arch/arm/cpu/armv8/generic_timer.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <bootstage.h>
99
#include <command.h>
1010
#include <time.h>
11+
#include <asm/global_data.h>
1112
#include <asm/system.h>
1213
#include <linux/bitops.h>
1314

‎arch/arm/cpu/armv8/s32v234/generic.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <cpu_func.h>
99
#include <init.h>
1010
#include <net.h>
11+
#include <asm/global_data.h>
1112
#include <asm/io.h>
1213
#include <asm/arch/imx-regs.h>
1314
#include <asm/arch/clock.h>

‎arch/arm/cpu/armv8/sec_firmware.c

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <image.h>
1111
#include <log.h>
1212
#include <asm/cache.h>
13+
#include <asm/global_data.h>
1314
#include <asm/ptrace.h>
1415
#include <linux/kernel.h>
1516
#include <asm/io.h>

‎arch/arm/include/asm/arch-rockchip/clock.h

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#ifndef _ASM_ARCH_CLOCK_H
77
#define _ASM_ARCH_CLOCK_H
88

9+
struct udevice;
10+
911
/* define pll mode */
1012
#define RKCLK_PLL_MODE_SLOW 0
1113
#define RKCLK_PLL_MODE_NORMAL 1

‎arch/arm/include/asm/arch-tegra/clock.h

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#ifndef _TEGRA_CLOCK_H_
99
#define _TEGRA_CLOCK_H_
1010

11+
struct udevice;
12+
1113
/* Set of oscillator frequencies supported in the internal API. */
1214
enum clock_osc_freq {
1315
/* All in MHz, so 13_0 is 13.0MHz */

‎arch/arm/include/asm/arch-tegra/tegra_i2c.h

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#include <asm/types.h>
1212

13+
struct udevice;
14+
1315
enum {
1416
I2C_TIMEOUT_USEC = 10000, /* Wait time for completion */
1517
I2C_FIFO_DEPTH = 8, /* I2C fifo depth */

‎arch/arm/include/asm/global_data.h

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
#ifndef __ASM_GBL_DATA_H
88
#define __ASM_GBL_DATA_H
99

10+
#include <asm/types.h>
11+
#include <linux/types.h>
12+
1013
/* Architecture-specific global data */
1114
struct arch_global_data {
1215
#if defined(CONFIG_FSL_ESDHC) || defined(CONFIG_FSL_ESDHC_IMX)

‎arch/arm/include/asm/secure.h

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define __ASM_SECURE_H
33

44
#include <config.h>
5+
#include <asm/global_data.h>
56

67
#define __secure __attribute__ ((section ("._secure.text")))
78
#define __secure_data __attribute__ ((section ("._secure.data")))

‎arch/arm/include/asm/ti-common/sys_proto.h

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#ifndef _TI_COMMON_SYS_PROTO_H_
77
#define _TI_COMMON_SYS_PROTO_H_
88

9+
#include <asm/global_data.h>
10+
911
DECLARE_GLOBAL_DATA_PTR;
1012

1113
#ifdef CONFIG_ARCH_OMAP2PLUS

‎arch/arm/lib/bdinfo.c

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <common.h>
1010
#include <init.h>
11+
#include <asm/global_data.h>
1112

1213
DECLARE_GLOBAL_DATA_PTR;
1314

‎arch/arm/lib/bootm-fdt.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#ifdef CONFIG_ARMV7_NONSEC
2020
#include <asm/armv7.h>
2121
#endif
22+
#include <asm/global_data.h>
2223
#include <asm/psci.h>
2324
#include <asm/spin_table.h>
2425

‎arch/arm/lib/bootm.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <hang.h>
2020
#include <lmb.h>
2121
#include <log.h>
22+
#include <asm/global_data.h>
2223
#include <dm/root.h>
2324
#include <env.h>
2425
#include <image.h>

‎arch/arm/lib/cache-cp15.c

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <common.h>
88
#include <cpu_func.h>
99
#include <log.h>
10+
#include <asm/global_data.h>
1011
#include <asm/system.h>
1112
#include <asm/cache.h>
1213
#include <linux/compiler.h>

‎arch/arm/lib/cache.c

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <log.h>
1212
#include <malloc.h>
1313
#include <asm/cache.h>
14+
#include <asm/global_data.h>
1415

1516
DECLARE_GLOBAL_DATA_PTR;
1617

0 commit comments

Comments
 (0)