Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit c62db35d52c6ba5f31ac36e690c58ec54b273298

Authored by Simon Glass
Committed by Tom Rini
1 parent 3a53e99c7d
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

arm: Add explicit include of <asm/mach-types.h> 

Rather than relying on common.h to provide this include, which is going
away at some point, include it explicitly in each file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 55 changed files with 55 additions and 0 deletions Side-by-side Diff

... ... @@ -12,6 +12,7 @@
12 12 #include <spl.h>
13 13 #include <image.h>
14 14 #include <linux/compiler.h>
  15 +#include <asm/mach-types.h>
15 16  
16 17 #ifndef CONFIG_SPL_DM
17 18 /* Pointer to as well as the global data structure for SPL */
board/Barix/ipam390/ipam390.c
Diff comments   View file @ c62db35
... ... @@ -29,6 +29,7 @@
29 29 #include <asm/gpio.h>
30 30 #include <hwconfig.h>
31 31 #include <bootstage.h>
  32 +#include <asm/mach-types.h>
32 33  
33 34 DECLARE_GLOBAL_DATA_PTR;
34 35  
board/LaCie/edminiv2/edminiv2.c
Diff comments   View file @ c62db35
... ... @@ -14,6 +14,7 @@
14 14 #include "../common/common.h"
15 15 #include <spl.h>
16 16 #include <ns16550.h>
  17 +#include <asm/mach-types.h>
17 18  
18 19 DECLARE_GLOBAL_DATA_PTR;
19 20  
board/LaCie/net2big_v2/net2big_v2.c
Diff comments   View file @ c62db35
... ... @@ -12,6 +12,7 @@
12 12 #include <common.h>
13 13 #include <command.h>
14 14 #include <i2c.h>
  15 +#include <asm/mach-types.h>
15 16 #include <asm/arch/cpu.h>
16 17 #include <asm/arch/soc.h>
17 18 #include <asm/arch/mpp.h>
board/LaCie/netspace_v2/netspace_v2.c
Diff comments   View file @ c62db35
... ... @@ -11,6 +11,7 @@
11 11  
12 12 #include <common.h>
13 13 #include <command.h>
  14 +#include <asm/mach-types.h>
14 15 #include <asm/arch/cpu.h>
15 16 #include <asm/arch/soc.h>
16 17 #include <asm/arch/mpp.h>
board/Marvell/aspenite/aspenite.c
Diff comments   View file @ c62db35
... ... @@ -9,6 +9,7 @@
9 9  
10 10 #include <common.h>
11 11 #include <mvmfp.h>
  12 +#include <asm/mach-types.h>
12 13 #include <asm/arch/cpu.h>
13 14 #include <asm/arch/mfp.h>
14 15 #include <asm/arch/armada100.h>
board/Marvell/gplugd/gplugd.c
Diff comments   View file @ c62db35
... ... @@ -19,6 +19,7 @@
19 19 #include <asm/arch/armada100.h>
20 20 #include <asm/gpio.h>
21 21 #include <miiphy.h>
  22 +#include <asm/mach-types.h>
22 23  
23 24 #ifdef CONFIG_ARMADA100_FEC
24 25 #include <net.h>
board/Marvell/guruplug/guruplug.c
Diff comments   View file @ c62db35
... ... @@ -8,6 +8,7 @@
8 8  
9 9 #include <common.h>
10 10 #include <miiphy.h>
  11 +#include <asm/mach-types.h>
11 12 #include <asm/arch/cpu.h>
12 13 #include <asm/arch/soc.h>
13 14 #include <asm/arch/mpp.h>
board/Marvell/openrd/openrd.c
Diff comments   View file @ c62db35
... ... @@ -13,6 +13,7 @@
13 13  
14 14 #include <common.h>
15 15 #include <miiphy.h>
  16 +#include <asm/mach-types.h>
16 17 #include <asm/arch/cpu.h>
17 18 #include <asm/arch/soc.h>
18 19 #include <asm/arch/mpp.h>
board/Marvell/sheevaplug/sheevaplug.c
Diff comments   View file @ c62db35
... ... @@ -8,6 +8,7 @@
8 8  
9 9 #include <common.h>
10 10 #include <miiphy.h>
  11 +#include <asm/mach-types.h>
11 12 #include <asm/arch/cpu.h>
12 13 #include <asm/arch/soc.h>
13 14 #include <asm/arch/mpp.h>
board/Seagate/dockstar/dockstar.c
Diff comments   View file @ c62db35
... ... @@ -15,6 +15,7 @@
15 15 #include <asm/arch/mpp.h>
16 16 #include <asm/arch/cpu.h>
17 17 #include <asm/io.h>
  18 +#include <asm/mach-types.h>
18 19 #include "dockstar.h"
19 20  
20 21 DECLARE_GLOBAL_DATA_PTR;
board/Seagate/goflexhome/goflexhome.c
Diff comments   View file @ c62db35
... ... @@ -14,6 +14,7 @@
14 14  
15 15 #include <common.h>
16 16 #include <miiphy.h>
  17 +#include <asm/mach-types.h>
17 18 #include <asm/arch/soc.h>
18 19 #include <asm/arch/mpp.h>
19 20 #include <asm/arch/cpu.h>
board/Seagate/nas220/nas220.c
Diff comments   View file @ c62db35
... ... @@ -11,6 +11,7 @@
11 11  
12 12 #include <common.h>
13 13 #include <miiphy.h>
  14 +#include <asm/mach-types.h>
14 15 #include <asm/arch/soc.h>
15 16 #include <asm/arch/mpp.h>
16 17 #include <asm/arch/cpu.h>
board/amazon/kc1/kc1.c
Diff comments   View file @ c62db35
... ... @@ -17,6 +17,7 @@
17 17 #include <asm/emif.h>
18 18 #include <twl6030.h>
19 19 #include "kc1.h"
  20 +#include <asm/mach-types.h>
20 21  
21 22 DECLARE_GLOBAL_DATA_PTR;
22 23  
board/armltd/integrator/integrator.c
Diff comments   View file @ c62db35
... ... @@ -24,6 +24,7 @@
24 24 #include <dm/platform_data/serial_pl01x.h>
25 25 #include "arm-ebi.h"
26 26 #include "integrator-sc.h"
  27 +#include <asm/mach-types.h>
27 28  
28 29 DECLARE_GLOBAL_DATA_PTR;
29 30  
board/armltd/vexpress/vexpress_common.c
Diff comments   View file @ c62db35
... ... @@ -21,6 +21,7 @@
21 21 #include <errno.h>
22 22 #include <netdev.h>
23 23 #include <asm/io.h>
  24 +#include <asm/mach-types.h>
24 25 #include <asm/arch/systimer.h>
25 26 #include <asm/arch/sysctrl.h>
26 27 #include <asm/arch/wdt.h>
board/atmel/at91rm9200ek/at91rm9200ek.c
Diff comments   View file @ c62db35
... ... @@ -12,6 +12,7 @@
12 12  
13 13 #include <common.h>
14 14 #include <netdev.h>
  15 +#include <asm/mach-types.h>
15 16 #include <asm/arch/hardware.h>
16 17 #include <asm/arch/at91_pio.h>
17 18 #include <asm/arch/at91_common.h>
board/atmel/at91sam9261ek/at91sam9261ek.c
Diff comments   View file @ c62db35
... ... @@ -21,6 +21,7 @@
21 21 #include <net.h>
22 22 #include <netdev.h>
23 23 #endif
  24 +#include <asm/mach-types.h>
24 25  
25 26 DECLARE_GLOBAL_DATA_PTR;
26 27  
board/atmel/at91sam9263ek/at91sam9263ek.c
Diff comments   View file @ c62db35
... ... @@ -20,6 +20,7 @@
20 20 #include <asm/arch/hardware.h>
21 21 #include <lcd.h>
22 22 #include <atmel_lcdc.h>
  23 +#include <asm/mach-types.h>
23 24  
24 25 DECLARE_GLOBAL_DATA_PTR;
25 26  
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
Diff comments   View file @ c62db35
... ... @@ -18,6 +18,7 @@
18 18 #include <lcd.h>
19 19 #include <linux/mtd/nand.h>
20 20 #include <atmel_lcdc.h>
  21 +#include <asm/mach-types.h>
21 22  
22 23 DECLARE_GLOBAL_DATA_PTR;
23 24  
board/atmel/at91sam9rlek/at91sam9rlek.c
Diff comments   View file @ c62db35
... ... @@ -9,6 +9,7 @@
9 9 #include <common.h>
10 10 #include <debug_uart.h>
11 11 #include <asm/io.h>
  12 +#include <asm/mach-types.h>
12 13 #include <asm/arch/at91sam9rl.h>
13 14 #include <asm/arch/at91sam9rl_matrix.h>
14 15 #include <asm/arch/at91sam9_smc.h>
board/atmel/at91sam9x5ek/at91sam9x5ek.c
Diff comments   View file @ c62db35
... ... @@ -19,6 +19,7 @@
19 19 #include <nand.h>
20 20 #include <version.h>
21 21 #endif
  22 +#include <asm/mach-types.h>
22 23  
23 24 DECLARE_GLOBAL_DATA_PTR;
24 25  
board/bluewater/gurnard/gurnard.c
Diff comments   View file @ c62db35
... ... @@ -21,6 +21,7 @@
21 21 #include <spi.h>
22 22 #include <asm/gpio.h>
23 23 #include <asm/io.h>
  24 +#include <asm/mach-types.h>
24 25 #include <asm/arch/at91sam9g45_matrix.h>
25 26 #include <asm/arch/at91sam9_smc.h>
26 27 #include <asm/arch/at91_common.h>
board/bluewater/snapper9260/snapper9260.c
Diff comments   View file @ c62db35
... ... @@ -12,6 +12,7 @@
12 12 #include <dm.h>
13 13 #include <asm/io.h>
14 14 #include <asm/gpio.h>
  15 +#include <asm/mach-types.h>
15 16 #include <asm/arch/at91sam9260_matrix.h>
16 17 #include <asm/arch/at91sam9_smc.h>
17 18 #include <asm/arch/at91_common.h>
board/cirrus/edb93xx/edb93xx.c
Diff comments   View file @ c62db35
... ... @@ -18,6 +18,7 @@
18 18 #include <common.h>
19 19 #include <netdev.h>
20 20 #include <asm/io.h>
  21 +#include <asm/mach-types.h>
21 22 #include <asm/arch/ep93xx.h>
22 23  
23 24 DECLARE_GLOBAL_DATA_PTR;
board/davinci/da8xxevm/da850evm.c
Diff comments   View file @ c62db35
... ... @@ -23,6 +23,7 @@
23 23 #include <asm/arch/davinci_misc.h>
24 24 #include <linux/errno.h>
25 25 #include <hwconfig.h>
  26 +#include <asm/mach-types.h>
26 27  
27 28 #ifdef CONFIG_MMC_DAVINCI
28 29 #include <mmc.h>
board/davinci/da8xxevm/omapl138_lcdk.c
Diff comments   View file @ c62db35
... ... @@ -19,6 +19,7 @@
19 19 #include <asm/ti-common/davinci_nand.h>
20 20 #include <asm/io.h>
21 21 #include <linux/errno.h>
  22 +#include <asm/mach-types.h>
22 23 #include <asm/arch/davinci_misc.h>
23 24 #ifdef CONFIG_MMC_DAVINCI
24 25 #include <mmc.h>
board/davinci/ea20/ea20.c
Diff comments   View file @ c62db35
... ... @@ -18,6 +18,7 @@
18 18 #include <i2c.h>
19 19 #include <net.h>
20 20 #include <netdev.h>
  21 +#include <asm/mach-types.h>
21 22 #include <asm/arch/hardware.h>
22 23 #include <asm/ti-common/davinci_nand.h>
23 24 #include <asm/arch/emac_defs.h>
board/esd/meesc/meesc.c
Diff comments   View file @ c62db35
... ... @@ -13,6 +13,7 @@
13 13 #include <common.h>
14 14 #include <asm/io.h>
15 15 #include <asm/gpio.h>
  16 +#include <asm/mach-types.h>
16 17 #include <asm/arch/at91sam9_smc.h>
17 18 #include <asm/arch/at91_common.h>
18 19 #include <asm/arch/at91_pmc.h>
board/freescale/mx35pdk/mx35pdk.c
Diff comments   View file @ c62db35
... ... @@ -24,6 +24,7 @@
24 24 #include <asm/gpio.h>
25 25 #include <asm/arch/sys_proto.h>
26 26 #include <netdev.h>
  27 +#include <asm/mach-types.h>
27 28  
28 29 #ifndef CONFIG_BOARD_LATE_INIT
29 30 #error "CONFIG_BOARD_LATE_INIT must be set for this board"
board/gumstix/duovero/duovero.c
Diff comments   View file @ c62db35
... ... @@ -14,6 +14,7 @@
14 14 #include <asm/arch/clock.h>
15 15 #include <asm/arch/gpio.h>
16 16 #include <asm/gpio.h>
  17 +#include <asm/mach-types.h>
17 18  
18 19 #include "duovero_mux_data.h"
19 20  
... ... @@ -11,6 +11,7 @@
11 11 #include <asm/arch/pxa-regs.h>
12 12 #include <asm/io.h>
13 13 #include <usb.h>
  14 +#include <asm/mach-types.h>
14 15  
15 16 DECLARE_GLOBAL_DATA_PTR;
16 17  
board/imx31_phycore/imx31_phycore.c
Diff comments   View file @ c62db35
... ... @@ -11,6 +11,7 @@
11 11 #include <netdev.h>
12 12 #include <asm/arch/clock.h>
13 13 #include <asm/arch/imx-regs.h>
  14 +#include <asm/mach-types.h>
14 15 #include <asm/arch/sys_proto.h>
15 16  
16 17 DECLARE_GLOBAL_DATA_PTR;
board/lego/ev3/legoev3.c
Diff comments   View file @ c62db35
... ... @@ -25,6 +25,7 @@
25 25 #include <asm/arch/davinci_misc.h>
26 26 #include <linux/errno.h>
27 27 #include <hwconfig.h>
  28 +#include <asm/mach-types.h>
28 29  
29 30 #ifdef CONFIG_MMC_DAVINCI
30 31 #include <mmc.h>
board/mini-box/picosam9g45/picosam9g45.c
Diff comments   View file @ c62db35
... ... @@ -27,6 +27,7 @@
27 27 #include <net.h>
28 28 #endif
29 29 #include <netdev.h>
  30 +#include <asm/mach-types.h>
30 31  
31 32 DECLARE_GLOBAL_DATA_PTR;
32 33  
board/nvidia/seaboard/seaboard.c
Diff comments   View file @ c62db35
... ... @@ -7,6 +7,7 @@
7 7  
8 8 #include <common.h>
9 9 #include <asm/io.h>
  10 +#include <asm/mach-types.h>
10 11 #include <asm/arch/tegra.h>
11 12 #include <asm/arch-tegra/board.h>
12 13 #include <asm/arch/clock.h>
board/overo/common.c
Diff comments   View file @ c62db35
... ... @@ -18,6 +18,7 @@
18 18 #include <asm/arch/mux.h>
19 19 #include <asm/arch/sys_proto.h>
20 20 #include <asm/gpio.h>
  21 +#include <asm/mach-types.h>
21 22  
22 23 DECLARE_GLOBAL_DATA_PTR;
23 24  
board/ronetix/pm9261/pm9261.c
Diff comments   View file @ c62db35
... ... @@ -26,6 +26,7 @@
26 26 #include <net.h>
27 27 #endif
28 28 #include <netdev.h>
  29 +#include <asm/mach-types.h>
29 30  
30 31 DECLARE_GLOBAL_DATA_PTR;
31 32  
board/ronetix/pm9263/pm9263.c
Diff comments   View file @ c62db35
... ... @@ -25,6 +25,7 @@
25 25 #include <net.h>
26 26 #endif
27 27 #include <netdev.h>
  28 +#include <asm/mach-types.h>
28 29  
29 30 DECLARE_GLOBAL_DATA_PTR;
30 31  
board/ronetix/pm9g45/pm9g45.c
Diff comments   View file @ c62db35
... ... @@ -25,6 +25,7 @@
25 25 #include <net.h>
26 26 #endif
27 27 #include <netdev.h>
  28 +#include <asm/mach-types.h>
28 29  
29 30 DECLARE_GLOBAL_DATA_PTR;
30 31  
board/samsung/goni/goni.c
Diff comments   View file @ c62db35
... ... @@ -17,6 +17,7 @@
17 17 #include <samsung/misc.h>
18 18 #include <usb.h>
19 19 #include <usb_mass_storage.h>
  20 +#include <asm/mach-types.h>
20 21  
21 22 DECLARE_GLOBAL_DATA_PTR;
22 23  
board/samsung/smdkc100/smdkc100.c
Diff comments   View file @ c62db35
... ... @@ -11,6 +11,7 @@
11 11 #include <asm/io.h>
12 12 #include <asm/arch/sromc.h>
13 13 #include <netdev.h>
  14 +#include <asm/mach-types.h>
14 15  
15 16 DECLARE_GLOBAL_DATA_PTR;
16 17  
board/samsung/universal_c210/universal.c
Diff comments   View file @ c62db35
... ... @@ -23,6 +23,7 @@
23 23 #include <libtizen.h>
24 24 #include <samsung/misc.h>
25 25 #include <usb_mass_storage.h>
  26 +#include <asm/mach-types.h>
26 27  
27 28 DECLARE_GLOBAL_DATA_PTR;
28 29  
board/siemens/common/board.c
Diff comments   View file @ c62db35
... ... @@ -28,6 +28,7 @@
28 28 #include <miiphy.h>
29 29 #include <cpsw.h>
30 30 #include <watchdog.h>
  31 +#include <asm/mach-types.h>
31 32 #include "../common/factoryset.h"
32 33  
33 34 DECLARE_GLOBAL_DATA_PTR;
board/spear/spear300/spear300.c
Diff comments   View file @ c62db35
... ... @@ -11,6 +11,7 @@
11 11 #include <nand.h>
12 12 #include <asm/io.h>
13 13 #include <linux/mtd/fsmc_nand.h>
  14 +#include <asm/mach-types.h>
14 15 #include <asm/arch/hardware.h>
15 16 #include <asm/arch/spr_defs.h>
16 17 #include <asm/arch/spr_misc.h>
board/spear/spear310/spear310.c
Diff comments   View file @ c62db35
... ... @@ -12,6 +12,7 @@
12 12 #include <nand.h>
13 13 #include <asm/io.h>
14 14 #include <linux/mtd/fsmc_nand.h>
  15 +#include <asm/mach-types.h>
15 16 #include <asm/arch/hardware.h>
16 17 #include <asm/arch/spr_defs.h>
17 18 #include <asm/arch/spr_misc.h>
board/spear/spear320/spear320.c
Diff comments   View file @ c62db35
... ... @@ -12,6 +12,7 @@
12 12 #include <nand.h>
13 13 #include <asm/io.h>
14 14 #include <linux/mtd/fsmc_nand.h>
  15 +#include <asm/mach-types.h>
15 16 #include <asm/arch/hardware.h>
16 17 #include <asm/arch/spr_defs.h>
17 18 #include <asm/arch/spr_misc.h>
board/spear/spear600/spear600.c
Diff comments   View file @ c62db35
... ... @@ -11,6 +11,7 @@
11 11 #include <nand.h>
12 12 #include <asm/io.h>
13 13 #include <linux/mtd/fsmc_nand.h>
  14 +#include <asm/mach-types.h>
14 15 #include <asm/arch/hardware.h>
15 16 #include <asm/arch/spr_defs.h>
16 17 #include <asm/arch/spr_misc.h>
board/spear/x600/x600.c
Diff comments   View file @ c62db35
... ... @@ -14,6 +14,7 @@
14 14 #include <phy.h>
15 15 #include <rtc.h>
16 16 #include <asm/io.h>
  17 +#include <asm/mach-types.h>
17 18 #include <asm/arch/hardware.h>
18 19 #include <asm/arch/spr_defs.h>
19 20 #include <asm/arch/spr_misc.h>
board/ti/omap5_uevm/evm.c
Diff comments   View file @ c62db35
... ... @@ -24,6 +24,7 @@
24 24 #include <sata.h>
25 25 #include <usb.h>
26 26 #include <asm/gpio.h>
  27 +#include <asm/mach-types.h>
27 28 #include <asm/arch/clock.h>
28 29 #include <asm/arch/ehci.h>
29 30 #include <asm/ehci-omap.h>
board/ti/panda/panda.c
Diff comments   View file @ c62db35
... ... @@ -6,6 +6,7 @@
6 6 * SPDX-License-Identifier: GPL-2.0+
7 7 */
8 8 #include <common.h>
  9 +#include <asm/mach-types.h>
9 10 #include <asm/arch/sys_proto.h>
10 11 #include <asm/arch/mmc_host_def.h>
11 12 #include <asm/arch/clock.h>
board/toradex/colibri_pxa270/colibri_pxa270.c
Diff comments   View file @ c62db35
... ... @@ -19,6 +19,7 @@
19 19 #include <netdev.h>
20 20 #include <serial.h>
21 21 #include <usb.h>
  22 +#include <asm/mach-types.h>
22 23 #include "../common/tdx-common.h"
23 24  
24 25 DECLARE_GLOBAL_DATA_PTR;
board/toradex/common/tdx-cfg-block.c
Diff comments   View file @ c62db35
... ... @@ -23,6 +23,7 @@
23 23 #include <malloc.h>
24 24 #include <mmc.h>
25 25 #include <nand.h>
  26 +#include <asm/mach-types.h>
26 27  
27 28 DECLARE_GLOBAL_DATA_PTR;
28 29  
board/zipitz2/zipitz2.c
Diff comments   View file @ c62db35
... ... @@ -16,6 +16,7 @@
16 16 #include <spi.h>
17 17 #include <asm/io.h>
18 18 #include <usb.h>
  19 +#include <asm/mach-types.h>
19 20  
20 21 DECLARE_GLOBAL_DATA_PTR;
21 22  
drivers/usb/host/ehci-mx6.c
Diff comments   View file @ c62db35
... ... @@ -17,6 +17,7 @@
17 17 #include <asm/imx-common/iomux-v3.h>
18 18 #include <asm/imx-common/sys_proto.h>
19 19 #include <dm.h>
  20 +#include <asm/mach-types.h>
20 21 #include <power/regulator.h>
21 22  
22 23 #include "ehci.h"