[PATCH 07/16] common: Drop asm/u-boot.h from common header
Simon Glass
sjg at chromium.org
Mon Aug 3 00:59:31 CEST 2020
Move this out of the common header and include it only where needed.
There is quite a bit of clean-up that could be undertaken late. For
example, some of the function prototypes defined in the various arch's
u-boot-xxx.h header are generic and could be defined in the generic
init.h header file.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
arch/arc/lib/bootm.c | 1 +
arch/arc/lib/cpu.c | 1 +
arch/arc/lib/interrupts.c | 1 +
arch/arm/cpu/arm1136/mx35/generic.c | 1 +
arch/arm/cpu/arm720t/cpu.c | 2 ++
arch/arm/cpu/arm926ejs/armada100/cpu.c | 1 +
arch/arm/cpu/arm926ejs/armada100/dram.c | 1 +
arch/arm/cpu/arm926ejs/mx25/generic.c | 1 +
arch/arm/cpu/arm926ejs/mx27/generic.c | 1 +
arch/arm/cpu/arm926ejs/mxs/mxs.c | 1 +
arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 +
arch/arm/cpu/arm926ejs/spear/cpu.c | 1 +
arch/arm/cpu/arm926ejs/spear/spl.c | 1 +
arch/arm/cpu/arm926ejs/spear/spr_misc.c | 1 +
arch/arm/cpu/armv7/cpu.c | 1 +
arch/arm/cpu/armv7/kona-common/s_init.c | 1 +
arch/arm/cpu/armv7/ls102xa/clock.c | 1 +
arch/arm/cpu/armv7/ls102xa/cpu.c | 1 +
arch/arm/cpu/armv7/ls102xa/fdt.c | 1 +
arch/arm/cpu/armv7/ls102xa/soc.c | 1 +
arch/arm/cpu/armv7/s5p-common/cpu_info.c | 1 +
arch/arm/cpu/armv7/s5p-common/timer.c | 1 +
arch/arm/cpu/armv7/vf610/generic.c | 1 +
arch/arm/cpu/armv7m/cpu.c | 1 +
arch/arm/cpu/armv8/cpu.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/mp.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 +
arch/arm/cpu/armv8/fsl-layerscape/spl.c | 1 +
arch/arm/cpu/armv8/s32v234/cpu.c | 1 +
arch/arm/cpu/armv8/s32v234/generic.c | 1 +
arch/arm/cpu/pxa/pxa2xx.c | 1 +
arch/arm/include/asm/arch-fsl-layerscape/clock.h | 1 +
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 +
arch/arm/include/asm/arch-fsl-layerscape/speed.h | 1 +
arch/arm/include/asm/arch-ls102xa/clock.h | 1 +
arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 1 +
arch/arm/include/asm/arch-mx27/mxcmmc.h | 1 +
arch/arm/include/asm/arch-mx31/sys_proto.h | 1 +
arch/arm/include/asm/arch-mx6/litesom.h | 1 +
arch/arm/include/asm/arch-mxs/sys_proto.h | 1 +
arch/arm/include/asm/mach-imx/sys_proto.h | 1 +
arch/arm/include/asm/omap_common.h | 1 +
arch/arm/lib/bdinfo.c | 1 +
arch/arm/lib/bootm-fdt.c | 1 +
arch/arm/lib/bootm.c | 1 +
arch/arm/lib/cache-cp15.c | 1 +
arch/arm/lib/image.c | 1 +
arch/arm/lib/interrupts_64.c | 1 +
arch/arm/lib/interrupts_m.c | 1 +
arch/arm/lib/reset.c | 1 +
arch/arm/lib/spl.c | 1 +
arch/arm/mach-aspeed/ast2500-board.c | 1 +
arch/arm/mach-at91/arm920t/cpu.c | 1 +
arch/arm/mach-at91/arm926ejs/cpu.c | 1 +
arch/arm/mach-at91/armv7/cpu.c | 1 +
arch/arm/mach-at91/spl_atmel.c | 1 +
arch/arm/mach-bcm283x/init.c | 1 +
arch/arm/mach-davinci/cpu.c | 1 +
arch/arm/mach-davinci/da850_lowlevel.c | 1 +
arch/arm/mach-davinci/include/mach/sdmmc_defs.h | 1 +
arch/arm/mach-davinci/misc.c | 1 +
arch/arm/mach-exynos/lowlevel_init.c | 1 +
arch/arm/mach-imx/cpu.c | 1 +
arch/arm/mach-imx/imx8/ahab.c | 1 +
arch/arm/mach-imx/imx8/cpu.c | 1 +
arch/arm/mach-imx/imx8/fdt.c | 1 +
arch/arm/mach-imx/imx8m/soc.c | 1 +
arch/arm/mach-imx/imxrt/soc.c | 1 +
arch/arm/mach-imx/misc.c | 1 +
arch/arm/mach-imx/mx5/mx53_dram.c | 1 +
arch/arm/mach-imx/mx6/litesom.c | 1 +
arch/arm/mach-imx/mx6/module_fuse.c | 1 +
arch/arm/mach-imx/mx6/opos6ul.c | 1 +
arch/arm/mach-imx/mx6/soc.c | 1 +
arch/arm/mach-imx/mx7/soc.c | 1 +
arch/arm/mach-imx/mx7ulp/soc.c | 1 +
arch/arm/mach-imx/spl.c | 1 +
arch/arm/mach-keystone/init.c | 1 +
arch/arm/mach-kirkwood/cpu.c | 1 +
arch/arm/mach-lpc32xx/cpu.c | 1 +
arch/arm/mach-mediatek/cpu.c | 1 +
arch/arm/mach-mediatek/mt8512/init.c | 1 +
arch/arm/mach-mediatek/mt8516/init.c | 1 +
arch/arm/mach-mediatek/mt8518/init.c | 1 +
arch/arm/mach-meson/board-common.c | 1 +
arch/arm/mach-mvebu/arm64-common.c | 1 +
arch/arm/mach-mvebu/armada3700/cpu.c | 1 +
arch/arm/mach-mvebu/armada8k/dram.c | 1 +
arch/arm/mach-mvebu/cpu.c | 1 +
arch/arm/mach-mvebu/dram.c | 1 +
arch/arm/mach-omap2/am33xx/board.c | 1 +
arch/arm/mach-omap2/am33xx/fdt.c | 1 +
arch/arm/mach-omap2/boot-common.c | 1 +
arch/arm/mach-omap2/fdt-common.c | 1 +
arch/arm/mach-omap2/hwinit-common.c | 1 +
arch/arm/mach-omap2/omap-cache.c | 1 +
arch/arm/mach-omap2/omap3/board.c | 1 +
arch/arm/mach-omap2/omap3/emac.c | 1 +
arch/arm/mach-omap2/omap3/emif4.c | 1 +
arch/arm/mach-omap2/omap3/sdrc.c | 1 +
arch/arm/mach-omap2/omap5/fdt.c | 1 +
arch/arm/mach-orion5x/cpu.c | 1 +
arch/arm/mach-orion5x/dram.c | 1 +
arch/arm/mach-owl/soc.c | 1 +
arch/arm/mach-rmobile/cpu_info.c | 1 +
arch/arm/mach-rmobile/emac.c | 1 +
arch/arm/mach-rmobile/memmap-gen3.c | 1 +
arch/arm/mach-rockchip/board.c | 1 +
arch/arm/mach-rockchip/px30/px30.c | 1 +
arch/arm/mach-rockchip/rk3128/rk3128.c | 1 +
arch/arm/mach-rockchip/rk3188/rk3188.c | 1 +
arch/arm/mach-rockchip/rk322x/rk322x.c | 1 +
arch/arm/mach-rockchip/rk3288/rk3288.c | 1 +
arch/arm/mach-rockchip/rk3308/rk3308.c | 1 +
arch/arm/mach-rockchip/rk3328/rk3328.c | 1 +
arch/arm/mach-rockchip/rk3368/rk3368.c | 1 +
arch/arm/mach-rockchip/rk3399/rk3399.c | 1 +
arch/arm/mach-rockchip/sdram.c | 1 +
arch/arm/mach-rockchip/spl.c | 1 +
arch/arm/mach-socfpga/board.c | 1 +
arch/arm/mach-socfpga/clock_manager.c | 1 +
arch/arm/mach-socfpga/misc.c | 1 +
arch/arm/mach-socfpga/misc_arria10.c | 1 +
arch/arm/mach-socfpga/misc_gen5.c | 1 +
arch/arm/mach-socfpga/misc_s10.c | 1 +
arch/arm/mach-stm32/soc.c | 1 +
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 1 +
arch/arm/mach-stm32mp/cpu.c | 1 +
arch/arm/mach-stm32mp/dram_init.c | 1 +
arch/arm/mach-stm32mp/fdt.c | 1 +
arch/arm/mach-stm32mp/spl.c | 1 +
arch/arm/mach-sunxi/board.c | 1 +
arch/arm/mach-tegra/ap.c | 1 +
arch/arm/mach-tegra/board2.c | 1 +
arch/arm/mach-tegra/cboot.c | 1 +
arch/arm/mach-tegra/dt-setup.c | 1 +
arch/arm/mach-uniphier/bcu/bcu-ld4.c | 1 +
arch/arm/mach-uniphier/board_init.c | 1 +
arch/arm/mach-uniphier/clk/dpll-ld4.c | 1 +
arch/arm/mach-uniphier/clk/dpll-pro4.c | 1 +
arch/arm/mach-uniphier/dram/umc-ld4.c | 1 +
arch/arm/mach-uniphier/dram/umc-pro4.c | 1 +
arch/arm/mach-uniphier/dram/umc-pxs2.c | 1 +
arch/arm/mach-uniphier/dram/umc-sld8.c | 1 +
arch/arm/mach-uniphier/fdt-fixup.c | 1 +
arch/arm/mach-uniphier/memconf.c | 1 +
arch/arm/mach-versal/clk.c | 1 +
arch/arm/mach-versal/cpu.c | 1 +
arch/arm/mach-zynq/clk.c | 1 +
arch/arm/mach-zynq/cpu.c | 1 +
arch/arm/mach-zynq/spl.c | 1 +
arch/arm/mach-zynqmp-r5/cpu.c | 1 +
arch/arm/mach-zynqmp/clk.c | 1 +
arch/arm/mach-zynqmp/cpu.c | 1 +
arch/arm/mach-zynqmp/spl.c | 1 +
arch/m68k/cpu/mcf5227x/cpu_init.c | 1 +
arch/m68k/cpu/mcf523x/cpu.c | 1 +
arch/m68k/cpu/mcf523x/cpu_init.c | 1 +
arch/m68k/cpu/mcf52x2/cpu.c | 1 +
arch/m68k/cpu/mcf52x2/cpu_init.c | 1 +
arch/m68k/cpu/mcf530x/cpu_init.c | 1 +
arch/m68k/cpu/mcf532x/cpu.c | 1 +
arch/m68k/cpu/mcf532x/cpu_init.c | 1 +
arch/m68k/cpu/mcf5445x/cpu.c | 1 +
arch/m68k/cpu/mcf5445x/cpu_init.c | 1 +
arch/m68k/cpu/mcf547x_8x/cpu.c | 1 +
arch/m68k/cpu/mcf547x_8x/cpu_init.c | 1 +
arch/m68k/lib/bdinfo.c | 1 +
arch/m68k/lib/bootm.c | 1 +
arch/m68k/lib/traps.c | 1 +
arch/microblaze/cpu/timer.c | 1 +
arch/microblaze/include/asm/processor.h | 1 +
arch/microblaze/lib/bootm.c | 1 +
arch/mips/lib/boot.c | 1 +
arch/mips/lib/bootm.c | 1 +
arch/mips/lib/traps.c | 1 +
arch/mips/mach-ath79/ar933x/clk.c | 1 +
arch/mips/mach-ath79/ar934x/clk.c | 1 +
arch/mips/mach-ath79/qca953x/clk.c | 1 +
arch/mips/mach-ath79/qca956x/clk.c | 1 +
arch/mips/mach-jz47xx/jz4780/jz4780.c | 1 +
arch/mips/mach-octeon/dram.c | 1 +
arch/nds32/cpu/n1213/ae3xx/cpu.c | 1 +
arch/nds32/cpu/n1213/ag101/cpu.c | 1 +
arch/nds32/cpu/n1213/ag101/timer.c | 2 ++
arch/nds32/lib/boot.c | 1 +
arch/nds32/lib/bootm.c | 1 +
arch/nds32/lib/interrupts.c | 1 +
arch/powerpc/cpu/mpc83xx/cpu.c | 1 +
arch/powerpc/cpu/mpc83xx/ecc.c | 1 +
arch/powerpc/cpu/mpc83xx/fdt.c | 1 +
arch/powerpc/cpu/mpc83xx/interrupts.c | 1 +
arch/powerpc/cpu/mpc83xx/law.c | 1 +
arch/powerpc/cpu/mpc83xx/pci.c | 1 +
arch/powerpc/cpu/mpc83xx/pcie.c | 1 +
arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 +
arch/powerpc/cpu/mpc83xx/speed.c | 1 +
arch/powerpc/cpu/mpc83xx/spl_minimal.c | 1 +
arch/powerpc/cpu/mpc83xx/traps.c | 1 +
arch/powerpc/cpu/mpc85xx/cmd_errata.c | 1 +
arch/powerpc/cpu/mpc85xx/cpu.c | 1 +
arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 +
arch/powerpc/cpu/mpc85xx/ether_fcc.c | 1 +
arch/powerpc/cpu/mpc85xx/fdt.c | 1 +
arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/interrupts.c | 1 +
arch/powerpc/cpu/mpc85xx/liodn.c | 1 +
arch/powerpc/cpu/mpc85xx/mp.c | 1 +
arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p1010_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p1021_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p1022_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p1023_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p2020_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p2041_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p3041_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p4080_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p5020_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/p5040_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/pci.c | 1 +
arch/powerpc/cpu/mpc85xx/qe_io.c | 1 +
arch/powerpc/cpu/mpc85xx/speed.c | 1 +
arch/powerpc/cpu/mpc85xx/spl_minimal.c | 1 +
arch/powerpc/cpu/mpc85xx/t1024_serdes.c | 2 +-
arch/powerpc/cpu/mpc85xx/t1040_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/t2080_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 1 +
arch/powerpc/cpu/mpc85xx/tlb.c | 1 +
arch/powerpc/cpu/mpc85xx/traps.c | 1 +
arch/powerpc/cpu/mpc86xx/cpu.c | 1 +
arch/powerpc/cpu/mpc86xx/cpu_init.c | 1 +
arch/powerpc/cpu/mpc86xx/fdt.c | 1 +
arch/powerpc/cpu/mpc86xx/interrupts.c | 1 +
arch/powerpc/cpu/mpc86xx/speed.c | 1 +
arch/powerpc/cpu/mpc86xx/traps.c | 1 +
arch/powerpc/cpu/mpc8xx/cpu.c | 1 +
arch/powerpc/cpu/mpc8xx/cpu_init.c | 1 +
arch/powerpc/cpu/mpc8xx/fdt.c | 1 +
arch/powerpc/cpu/mpc8xx/immap.c | 1 +
arch/powerpc/cpu/mpc8xx/interrupts.c | 1 +
arch/powerpc/cpu/mpc8xx/traps.c | 1 +
arch/powerpc/cpu/mpc8xxx/cpu.c | 1 +
arch/powerpc/cpu/mpc8xxx/fdt.c | 1 +
arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 1 +
arch/powerpc/cpu/mpc8xxx/fsl_pamu.c | 1 +
arch/powerpc/cpu/mpc8xxx/law.c | 1 +
arch/powerpc/cpu/mpc8xxx/srio.c | 1 +
arch/powerpc/include/asm/fsl_liodn.h | 1 +
arch/powerpc/include/asm/ppc.h | 1 +
arch/powerpc/lib/bdinfo.c | 1 +
arch/powerpc/lib/bootm.c | 1 +
arch/powerpc/lib/extable.c | 1 +
arch/powerpc/lib/interrupts.c | 7 ++++---
arch/powerpc/lib/kgdb.c | 1 +
arch/riscv/cpu/ax25/cpu.c | 1 +
arch/riscv/cpu/cpu.c | 1 +
arch/riscv/cpu/fu540/cpu.c | 1 +
arch/riscv/cpu/fu540/dram.c | 1 +
arch/riscv/cpu/generic/cpu.c | 1 +
arch/riscv/cpu/generic/dram.c | 1 +
arch/riscv/lib/boot.c | 1 +
arch/riscv/lib/bootm.c | 1 +
arch/riscv/lib/fdt_fixup.c | 1 +
arch/sandbox/cpu/cpu.c | 1 +
arch/sandbox/cpu/start.c | 1 +
arch/sandbox/lib/pci_io.c | 1 +
arch/sh/cpu/sh4/cpu.c | 1 +
arch/x86/cpu/apollolake/cpu_spl.c | 1 +
arch/x86/cpu/baytrail/early_uart.c | 1 +
arch/x86/cpu/baytrail/valleyview.c | 1 +
arch/x86/cpu/braswell/braswell.c | 1 +
arch/x86/cpu/braswell/early_uart.c | 1 +
arch/x86/cpu/broadwell/cpu.c | 1 +
arch/x86/cpu/broadwell/cpu_full.c | 1 +
arch/x86/cpu/broadwell/refcode.c | 1 +
arch/x86/cpu/broadwell/sdram.c | 1 +
arch/x86/cpu/coreboot/coreboot.c | 1 +
arch/x86/cpu/coreboot/sdram.c | 1 +
arch/x86/cpu/coreboot/timestamp.c | 1 +
arch/x86/cpu/cpu.c | 1 +
arch/x86/cpu/efi/app.c | 1 +
arch/x86/cpu/efi/payload.c | 1 +
arch/x86/cpu/efi/sdram.c | 1 +
arch/x86/cpu/i386/cpu.c | 1 +
arch/x86/cpu/i386/interrupt.c | 1 +
arch/x86/cpu/intel_common/cpu_from_spl.c | 1 +
arch/x86/cpu/intel_common/mrc.c | 1 +
arch/x86/cpu/ivybridge/cpu.c | 1 +
arch/x86/cpu/ivybridge/ivybridge.c | 1 +
arch/x86/cpu/ivybridge/sdram.c | 1 +
arch/x86/cpu/ivybridge/sdram_nop.c | 1 +
arch/x86/cpu/qemu/dram.c | 1 +
arch/x86/cpu/qemu/qemu.c | 1 +
arch/x86/cpu/quark/dram.c | 1 +
arch/x86/cpu/quark/mrc.c | 1 +
arch/x86/cpu/quark/mrc_util.c | 1 +
arch/x86/cpu/quark/quark.c | 1 +
arch/x86/cpu/quark/smc.c | 1 +
arch/x86/cpu/queensbay/tnc.c | 1 +
arch/x86/cpu/slimbootloader/sdram.c | 1 +
arch/x86/cpu/slimbootloader/slimbootloader.c | 1 +
arch/x86/cpu/tangier/sdram.c | 1 +
arch/x86/cpu/tangier/tangier.c | 1 +
arch/x86/cpu/x86_64/cpu.c | 1 +
arch/x86/lib/bootm.c | 1 +
arch/x86/lib/fsp/fsp_common.c | 1 +
arch/x86/lib/fsp/fsp_dram.c | 1 +
arch/x86/lib/fsp1/fsp_dram.c | 1 +
arch/x86/lib/fsp1/fsp_support.c | 1 +
arch/x86/lib/fsp2/fsp_dram.c | 1 +
arch/x86/lib/fsp2/fsp_meminit.c | 1 +
arch/x86/lib/i8254.c | 1 +
arch/x86/lib/init_helpers.c | 1 +
arch/x86/lib/interrupts.c | 1 +
arch/x86/lib/ramtest.c | 1 +
arch/x86/lib/spl.c | 1 +
arch/x86/lib/tpl.c | 1 +
arch/xtensa/cpu/cpu.c | 1 +
arch/xtensa/lib/bootm.c | 1 +
board/AndesTech/adp-ae3xx/adp-ae3xx.c | 1 +
board/AndesTech/adp-ag101p/adp-ag101p.c | 1 +
board/AndesTech/ax25-ae350/ax25-ae350.c | 1 +
board/Arcturus/ucp1020/ddr.c | 1 +
board/Arcturus/ucp1020/law.c | 1 +
board/Arcturus/ucp1020/spl.c | 1 +
board/Arcturus/ucp1020/tlb.c | 1 +
board/Arcturus/ucp1020/ucp1020.c | 1 +
board/BuR/brppt1/board.c | 1 +
board/BuR/brppt2/board.c | 1 +
board/BuR/brsmarc1/board.c | 1 +
board/BuR/brxre1/board.c | 1 +
board/BuR/common/bur_common.h | 1 +
board/BuR/common/common.c | 1 +
board/CZ.NIC/turris_mox/turris_mox.c | 1 +
board/CZ.NIC/turris_omnia/turris_omnia.c | 1 +
board/CarMediaLab/flea3/flea3.c | 1 +
board/LaCie/edminiv2/edminiv2.c | 1 +
board/LaCie/net2big_v2/net2big_v2.c | 1 +
board/LaCie/netspace_v2/netspace_v2.c | 1 +
board/Marvell/aspenite/aspenite.c | 1 +
board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 1 +
board/Marvell/db-88f6720/db-88f6720.c | 1 +
board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 1 +
board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 1 +
board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 1 +
board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 1 +
board/Marvell/dreamplug/dreamplug.c | 1 +
board/Marvell/gplugd/gplugd.c | 1 +
board/Marvell/guruplug/guruplug.c | 1 +
board/Marvell/mvebu_armada-37xx/board.c | 1 +
board/Marvell/mvebu_armada-8k/board.c | 1 +
board/Marvell/openrd/openrd.c | 1 +
board/Marvell/sheevaplug/sheevaplug.c | 1 +
board/Seagate/dockstar/dockstar.c | 1 +
board/Seagate/goflexhome/goflexhome.c | 1 +
board/Seagate/nas220/nas220.c | 1 +
board/Synology/ds109/ds109.c | 1 +
board/Synology/ds414/ds414.c | 1 +
board/abilis/tb100/tb100.c | 1 +
board/advantech/dms-ba16/dms-ba16.c | 1 +
board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c | 1 +
board/advantech/imx8qm_rom7720_a1/spl.c | 1 +
board/advantech/som-db5800-som-6867/som-db5800-som-6867.c | 1 +
board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 1 +
board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c | 1 +
board/alliedtelesis/x530/x530.c | 1 +
board/amazon/kc1/kc1.c | 1 +
board/aristainetos/aristainetos.c | 1 +
board/armadeus/apf27/apf27.c | 1 +
board/armltd/integrator/integrator.c | 1 +
board/armltd/vexpress/vexpress_common.c | 1 +
board/armltd/vexpress64/vexpress64.c | 1 +
board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 1 +
board/atmel/at91rm9200ek/at91rm9200ek.c | 1 +
board/atmel/at91sam9260ek/at91sam9260ek.c | 1 +
board/atmel/at91sam9261ek/at91sam9261ek.c | 1 +
board/atmel/at91sam9263ek/at91sam9263ek.c | 1 +
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 1 +
board/atmel/at91sam9n12ek/at91sam9n12ek.c | 1 +
board/atmel/at91sam9rlek/at91sam9rlek.c | 1 +
board/atmel/at91sam9x5ek/at91sam9x5ek.c | 1 +
board/atmel/common/video_display.c | 1 +
board/atmel/sam9x60ek/sam9x60ek.c | 1 +
board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 1 +
board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 1 +
board/atmel/sama5d2_icp/sama5d2_icp.c | 1 +
board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c | 1 +
board/atmel/sama5d2_xplained/sama5d2_xplained.c | 1 +
board/atmel/sama5d3_xplained/sama5d3_xplained.c | 1 +
board/atmel/sama5d3xek/sama5d3xek.c | 1 +
board/atmel/sama5d4_xplained/sama5d4_xplained.c | 1 +
board/atmel/sama5d4ek/sama5d4ek.c | 1 +
board/bachmann/ot1200/ot1200.c | 1 +
board/bachmann/ot1200/ot1200_spl.c | 1 +
board/barco/platinum/platinum.c | 1 +
board/barco/platinum/spl_picon.c | 1 +
board/barco/platinum/spl_titanium.c | 1 +
board/barco/titanium/titanium.c | 1 +
board/beacon/beacon-rzg2m/beacon-rzg2m.c | 1 +
board/beacon/imx8mm/imx8mm_beacon.c | 1 +
board/beacon/imx8mm/spl.c | 1 +
board/beckhoff/mx53cx9020/mx53cx9020.c | 1 +
board/bluegiga/apx4devkit/apx4devkit.c | 1 +
board/bluewater/gurnard/gurnard.c | 1 +
board/bluewater/snapper9260/snapper9260.c | 1 +
board/bosch/guardian/board.c | 1 +
board/bosch/shc/board.c | 1 +
board/boundary/nitrogen6x/nitrogen6x.c | 1 +
board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 1 +
board/broadcom/bcm28155_ap/bcm28155_ap.c | 1 +
board/broadcom/bcm963158/bcm963158.c | 1 +
board/broadcom/bcm968360bg/bcm968360bg.c | 1 +
board/broadcom/bcm968580xref/bcm968580xref.c | 1 +
board/broadcom/bcm_ep/board.c | 1 +
board/broadcom/bcmns2/northstar2.c | 1 +
board/broadcom/bcmstb/bcmstb.c | 1 +
board/bticino/mamoj/mamoj.c | 1 +
board/bticino/mamoj/spl.c | 1 +
board/buffalo/lsxl/lsxl.c | 1 +
board/cadence/xtfpga/xtfpga.c | 1 +
board/calao/usb_a9263/usb_a9263.c | 1 +
board/cavium/thunderx/thunderx.c | 1 +
board/ccv/xpress/spl.c | 1 +
board/ccv/xpress/xpress.c | 1 +
board/cirrus/edb93xx/edb93xx.c | 1 +
board/cloudengines/pogo_e02/pogo_e02.c | 1 +
board/compulab/cl-som-imx7/cl-som-imx7.c | 1 +
board/compulab/cl-som-imx7/spl.c | 1 +
board/compulab/cm_fx6/cm_fx6.c | 1 +
board/compulab/cm_fx6/spl.c | 1 +
board/compulab/cm_t335/cm_t335.c | 1 +
board/compulab/cm_t43/cm_t43.c | 1 +
board/congatec/cgtqmx6eval/cgtqmx6eval.c | 1 +
board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 1 +
board/corscience/tricorder/tricorder.c | 1 +
board/cortina/presidio-asic/presidio.c | 1 +
board/creative/xfi3/xfi3.c | 1 +
board/cssi/MCR3000/MCR3000.c | 1 +
board/d-link/dns325/dns325.c | 1 +
board/davinci/da8xxevm/da850evm.c | 1 +
board/davinci/da8xxevm/omapl138_lcdk.c | 1 +
board/dfi/dfi-bt700/dfi-bt700.c | 1 +
board/dhelectronics/dh_imx6/dh_imx6.c | 1 +
board/dhelectronics/dh_imx6/dh_imx6_spl.c | 1 +
board/dhelectronics/dh_stm32mp1/board.c | 1 +
board/ea/mx7ulp_com/mx7ulp_com.c | 1 +
board/eets/pdu001/board.c | 1 +
board/egnite/ethernut5/ethernut5.c | 1 +
board/el/el6x/el6x.c | 1 +
board/elgin/elgin_rv1108/elgin_rv1108.c | 1 +
board/embest/mx6boards/mx6boards.c | 1 +
board/emulation/qemu-arm/qemu-arm.c | 1 +
board/emulation/qemu-riscv/qemu-riscv.c | 1 +
board/engicam/common/board.c | 1 +
board/engicam/common/spl.c | 1 +
board/esd/meesc/meesc.c | 1 +
board/esd/vme8349/vme8349.c | 1 +
board/freescale/common/cds_pci_ft.c | 1 +
board/freescale/common/p_corenet/law.c | 1 +
board/freescale/common/p_corenet/pci.c | 1 +
board/freescale/common/p_corenet/tlb.c | 1 +
board/freescale/common/vid.c | 1 +
board/freescale/corenet_ds/corenet_ds.c | 1 +
board/freescale/corenet_ds/corenet_ds.h | 1 +
board/freescale/corenet_ds/ddr.c | 1 +
board/freescale/corenet_ds/eth_hydra.c | 1 +
board/freescale/corenet_ds/eth_p4080.c | 1 +
board/freescale/corenet_ds/eth_superhydra.c | 1 +
board/freescale/imx8mm_evk/imx8mm_evk.c | 1 +
board/freescale/imx8mm_evk/spl.c | 1 +
board/freescale/imx8mn_evk/imx8mn_evk.c | 1 +
board/freescale/imx8mn_evk/spl.c | 1 +
board/freescale/imx8mp_evk/imx8mp_evk.c | 1 +
board/freescale/imx8mp_evk/spl.c | 1 +
board/freescale/imx8mq_evk/imx8mq_evk.c | 1 +
board/freescale/imx8mq_evk/spl.c | 1 +
board/freescale/imx8qm_mek/imx8qm_mek.c | 1 +
board/freescale/imx8qm_mek/spl.c | 1 +
board/freescale/imx8qxp_mek/imx8qxp_mek.c | 1 +
board/freescale/imx8qxp_mek/spl.c | 1 +
board/freescale/imxrt1020-evk/imxrt1020-evk.c | 1 +
board/freescale/imxrt1050-evk/imxrt1050-evk.c | 1 +
board/freescale/ls1012afrdm/ls1012afrdm.c | 1 +
board/freescale/ls1012aqds/ls1012aqds.c | 1 +
board/freescale/ls1012ardb/ls1012ardb.c | 1 +
board/freescale/ls1021aiot/ls1021aiot.c | 1 +
board/freescale/ls1021aqds/ddr.c | 1 +
board/freescale/ls1021aqds/eth.c | 1 +
board/freescale/ls1021aqds/ls1021aqds.c | 1 +
board/freescale/ls1021atsn/ls1021atsn.c | 1 +
board/freescale/ls1021atwr/ls1021atwr.c | 1 +
board/freescale/ls1028a/ls1028a.c | 1 +
board/freescale/ls1043aqds/ddr.c | 1 +
board/freescale/ls1043aqds/eth.c | 1 +
board/freescale/ls1043aqds/ls1043aqds.c | 1 +
board/freescale/ls1043ardb/ddr.c | 1 +
board/freescale/ls1043ardb/eth.c | 1 +
board/freescale/ls1043ardb/ls1043ardb.c | 1 +
board/freescale/ls1046afrwy/eth.c | 1 +
board/freescale/ls1046afrwy/ls1046afrwy.c | 1 +
board/freescale/ls1046aqds/ddr.c | 1 +
board/freescale/ls1046aqds/eth.c | 1 +
board/freescale/ls1046aqds/ls1046aqds.c | 1 +
board/freescale/ls1046ardb/ddr.c | 1 +
board/freescale/ls1046ardb/eth.c | 1 +
board/freescale/ls1046ardb/ls1046ardb.c | 1 +
board/freescale/ls1088a/ddr.c | 1 +
board/freescale/ls1088a/eth_ls1088aqds.c | 1 +
board/freescale/ls1088a/eth_ls1088ardb.c | 1 +
board/freescale/ls1088a/ls1088a.c | 1 +
board/freescale/ls2080a/ddr.c | 1 +
board/freescale/ls2080a/ls2080a.c | 1 +
board/freescale/ls2080aqds/ddr.c | 1 +
board/freescale/ls2080aqds/eth.c | 1 +
board/freescale/ls2080aqds/ls2080aqds.c | 1 +
board/freescale/ls2080ardb/ddr.c | 1 +
board/freescale/ls2080ardb/eth_ls2080rdb.c | 1 +
board/freescale/ls2080ardb/ls2080ardb.c | 1 +
board/freescale/lx2160a/eth_lx2160aqds.c | 1 +
board/freescale/lx2160a/eth_lx2160ardb.c | 1 +
board/freescale/lx2160a/lx2160a.c | 1 +
board/freescale/m5253demo/m5253demo.c | 1 +
board/freescale/mpc8308rdb/mpc8308rdb.c | 1 +
board/freescale/mpc8313erdb/mpc8313erdb.c | 1 +
board/freescale/mpc8315erdb/mpc8315erdb.c | 1 +
board/freescale/mpc8323erdb/mpc8323erdb.c | 1 +
board/freescale/mpc832xemds/mpc832xemds.c | 1 +
board/freescale/mpc8349emds/ddr.c | 1 +
board/freescale/mpc8349emds/mpc8349emds.c | 1 +
board/freescale/mpc8349itx/mpc8349itx.c | 1 +
board/freescale/mpc837xemds/mpc837xemds.c | 1 +
board/freescale/mpc837xemds/pci.c | 1 +
board/freescale/mpc837xemds/pci.h | 1 +
board/freescale/mpc837xerdb/mpc837xerdb.c | 1 +
board/freescale/mpc8541cds/law.c | 1 +
board/freescale/mpc8541cds/mpc8541cds.c | 1 +
board/freescale/mpc8541cds/tlb.c | 1 +
board/freescale/mpc8544ds/law.c | 1 +
board/freescale/mpc8544ds/mpc8544ds.c | 1 +
board/freescale/mpc8544ds/tlb.c | 1 +
board/freescale/mpc8548cds/law.c | 1 +
board/freescale/mpc8548cds/mpc8548cds.c | 1 +
board/freescale/mpc8548cds/tlb.c | 1 +
board/freescale/mpc8555cds/law.c | 1 +
board/freescale/mpc8555cds/mpc8555cds.c | 1 +
board/freescale/mpc8555cds/tlb.c | 1 +
board/freescale/mpc8568mds/law.c | 1 +
board/freescale/mpc8568mds/mpc8568mds.c | 1 +
board/freescale/mpc8568mds/tlb.c | 1 +
board/freescale/mpc8569mds/law.c | 1 +
board/freescale/mpc8569mds/mpc8569mds.c | 1 +
board/freescale/mpc8569mds/tlb.c | 1 +
board/freescale/mpc8572ds/ddr.c | 1 +
board/freescale/mpc8572ds/law.c | 1 +
board/freescale/mpc8572ds/mpc8572ds.c | 1 +
board/freescale/mpc8572ds/tlb.c | 1 +
board/freescale/mpc8610hpcd/law.c | 1 +
board/freescale/mpc8610hpcd/mpc8610hpcd.c | 1 +
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 1 +
board/freescale/mpc8641hpcn/ddr.c | 1 +
board/freescale/mpc8641hpcn/law.c | 1 +
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 1 +
board/freescale/mx23evk/mx23evk.c | 1 +
board/freescale/mx25pdk/mx25pdk.c | 1 +
board/freescale/mx28evk/mx28evk.c | 1 +
board/freescale/mx35pdk/mx35pdk.c | 1 +
board/freescale/mx51evk/mx51evk.c | 1 +
board/freescale/mx53ard/mx53ard.c | 1 +
board/freescale/mx53evk/mx53evk.c | 1 +
board/freescale/mx53loco/mx53loco.c | 1 +
board/freescale/mx53smd/mx53smd.c | 1 +
board/freescale/mx6memcal/mx6memcal.c | 1 +
board/freescale/mx6memcal/spl.c | 1 +
board/freescale/mx6qarm2/mx6qarm2.c | 1 +
board/freescale/mx6sabreauto/mx6sabreauto.c | 1 +
board/freescale/mx6sabresd/mx6sabresd.c | 1 +
board/freescale/mx6slevk/mx6slevk.c | 1 +
board/freescale/mx6sllevk/mx6sllevk.c | 1 +
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 1 +
board/freescale/mx6sxsabresd/mx6sxsabresd.c | 1 +
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 1 +
board/freescale/mx6ullevk/mx6ullevk.c | 1 +
board/freescale/mx7dsabresd/mx7dsabresd.c | 1 +
board/freescale/mx7ulp_evk/mx7ulp_evk.c | 1 +
board/freescale/p1010rdb/ddr.c | 1 +
board/freescale/p1010rdb/law.c | 1 +
board/freescale/p1010rdb/p1010rdb.c | 1 +
board/freescale/p1010rdb/spl.c | 1 +
board/freescale/p1010rdb/tlb.c | 1 +
board/freescale/p1023rdb/law.c | 1 +
board/freescale/p1023rdb/p1023rdb.c | 1 +
board/freescale/p1023rdb/tlb.c | 1 +
board/freescale/p1_p2_rdb_pc/ddr.c | 1 +
board/freescale/p1_p2_rdb_pc/law.c | 1 +
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 1 +
board/freescale/p1_p2_rdb_pc/spl.c | 1 +
board/freescale/p1_p2_rdb_pc/tlb.c | 1 +
board/freescale/p2041rdb/ddr.c | 1 +
board/freescale/p2041rdb/eth.c | 1 +
board/freescale/p2041rdb/p2041rdb.c | 1 +
board/freescale/qemu-ppce500/qemu-ppce500.c | 1 +
board/freescale/s32v234evb/s32v234evb.c | 1 +
board/freescale/t102xrdb/ddr.c | 1 +
board/freescale/t102xrdb/eth_t102xrdb.c | 1 +
board/freescale/t102xrdb/law.c | 1 +
board/freescale/t102xrdb/pci.c | 1 +
board/freescale/t102xrdb/spl.c | 1 +
board/freescale/t102xrdb/t102xrdb.c | 1 +
board/freescale/t102xrdb/t102xrdb.h | 1 +
board/freescale/t102xrdb/tlb.c | 1 +
board/freescale/t104xrdb/ddr.c | 1 +
board/freescale/t104xrdb/diu.c | 1 +
board/freescale/t104xrdb/eth.c | 1 +
board/freescale/t104xrdb/law.c | 1 +
board/freescale/t104xrdb/pci.c | 1 +
board/freescale/t104xrdb/spl.c | 1 +
board/freescale/t104xrdb/t104xrdb.c | 1 +
board/freescale/t104xrdb/t104xrdb.h | 1 +
board/freescale/t104xrdb/tlb.c | 1 +
board/freescale/t208xqds/ddr.c | 1 +
board/freescale/t208xqds/eth_t208xqds.c | 1 +
board/freescale/t208xqds/law.c | 1 +
board/freescale/t208xqds/pci.c | 1 +
board/freescale/t208xqds/spl.c | 1 +
board/freescale/t208xqds/t208xqds.c | 1 +
board/freescale/t208xqds/t208xqds.h | 1 +
board/freescale/t208xqds/tlb.c | 1 +
board/freescale/t208xrdb/cpld.c | 1 +
board/freescale/t208xrdb/ddr.c | 1 +
board/freescale/t208xrdb/eth_t208xrdb.c | 1 +
board/freescale/t208xrdb/law.c | 1 +
board/freescale/t208xrdb/pci.c | 1 +
board/freescale/t208xrdb/spl.c | 1 +
board/freescale/t208xrdb/t208xrdb.c | 1 +
board/freescale/t208xrdb/t208xrdb.h | 1 +
board/freescale/t208xrdb/tlb.c | 1 +
board/freescale/t4rdb/ddr.c | 1 +
board/freescale/t4rdb/eth.c | 1 +
board/freescale/t4rdb/law.c | 1 +
board/freescale/t4rdb/pci.c | 1 +
board/freescale/t4rdb/spl.c | 1 +
board/freescale/t4rdb/t4240rdb.c | 1 +
board/freescale/t4rdb/t4rdb.h | 1 +
board/freescale/t4rdb/tlb.c | 1 +
board/freescale/vf610twr/vf610twr.c | 1 +
board/gardena/smart-gateway-at91sam/board.c | 1 +
board/gateworks/gw_ventana/common.c | 1 +
board/gateworks/gw_ventana/gw_ventana.c | 1 +
board/gateworks/gw_ventana/gw_ventana_spl.c | 1 +
board/gdsys/a38x/controlcenterdc.c | 1 +
board/gdsys/common/ioep-fpga.c | 2 +-
board/gdsys/mpc8308/gazerbeam.c | 1 +
board/gdsys/mpc8308/hrcon.c | 1 +
board/gdsys/mpc8308/strider.c | 1 +
board/gdsys/p1022/controlcenterd.c | 1 +
board/gdsys/p1022/diu.c | 1 +
board/gdsys/p1022/law.c | 1 +
board/gdsys/p1022/tlb.c | 1 +
board/ge/bx50v3/bx50v3.c | 1 +
board/ge/mx53ppd/mx53ppd.c | 1 +
board/google/chromebook_coral/coral.c | 1 +
board/google/imx8mq_phanbell/imx8mq_phanbell.c | 1 +
board/google/imx8mq_phanbell/spl.c | 1 +
board/grinn/chiliboard/board.c | 1 +
board/grinn/liteboard/board.c | 1 +
board/highbank/highbank.c | 1 +
board/hisilicon/hikey/hikey.c | 1 +
board/hisilicon/hikey960/hikey960.c | 1 +
board/hisilicon/poplar/poplar.c | 1 +
board/ids/ids8313/ids8313.c | 1 +
board/imgtec/boston/ddr.c | 1 +
board/imgtec/boston/dt.c | 1 +
board/imgtec/ci20/ci20.c | 1 +
board/imgtec/malta/malta.c | 1 +
board/inversepath/usbarmory/usbarmory.c | 1 +
board/iomega/iconnect/iconnect.c | 1 +
board/isee/igep003x/board.c | 1 +
board/isee/igep00x0/common.c | 1 +
board/isee/igep00x0/igep00x0.c | 1 +
board/k+p/kp_imx53/kp_imx53.c | 1 +
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 1 +
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 1 +
board/keymile/common/common.c | 1 +
board/keymile/common/qrio.c | 1 +
board/keymile/km83xx/km83xx.c | 1 +
board/keymile/km83xx/km83xx_i2c.c | 1 +
board/keymile/km_arm/km_arm.c | 1 +
board/keymile/kmp204x/eth.c | 1 +
board/keymile/kmp204x/kmp204x.c | 1 +
board/keymile/kmp204x/kmp204x.h | 1 +
board/keymile/kmp204x/law.c | 1 +
board/keymile/kmp204x/pci.c | 1 +
board/keymile/kmp204x/tlb.c | 1 +
board/kmc/kzm9g/kzm9g.c | 1 +
board/kobol/helios4/helios4.c | 1 +
board/kosagi/novena/novena.c | 1 +
board/kosagi/novena/novena_spl.c | 1 +
board/l+g/vinco/vinco.c | 1 +
board/laird/wb45n/wb45n.c | 1 +
board/laird/wb50n/wb50n.c | 1 +
board/lego/ev3/legoev3.c | 1 +
board/lg/sniper/sniper.c | 1 +
board/liebherr/display5/display5.c | 1 +
board/liebherr/display5/spl.c | 1 +
board/liebherr/mccmon6/mccmon6.c | 1 +
board/liebherr/mccmon6/spl.c | 1 +
board/liebherr/xea/xea.c | 1 +
board/logicpd/am3517evm/am3517evm.c | 1 +
board/logicpd/imx6/imx6logic.c | 1 +
board/logicpd/omap3som/omap3logic.c | 1 +
board/maxbcm/maxbcm.c | 1 +
board/mediatek/mt7622/mt7622_rfb.c | 1 +
board/mediatek/mt7623/mt7623_rfb.c | 1 +
board/mediatek/mt7629/mt7629_rfb.c | 1 +
board/mediatek/mt8512/mt8512.c | 1 +
board/mediatek/mt8518/mt8518_ap1.c | 1 +
board/mediatek/pumpkin/pumpkin.c | 1 +
board/menlo/m53menlo/m53menlo.c | 1 +
board/microchip/mpfs_icicle/mpfs_icicle.c | 1 +
board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c | 1 +
board/mini-box/picosam9g45/picosam9g45.c | 1 +
board/mpc8308_p1m/mpc8308_p1m.c | 1 +
board/mscc/jr2/jr2.c | 1 +
board/mscc/luton/luton.c | 1 +
board/mscc/ocelot/ocelot.c | 1 +
board/mscc/serval/serval.c | 1 +
board/mscc/servalt/servalt.c | 1 +
board/nokia/rx51/rx51.c | 1 +
board/novtech/meerkat96/meerkat96.c | 1 +
board/nvidia/p2371-2180/p2371-2180.c | 1 +
board/nvidia/p2771-0000/p2771-0000.c | 1 +
board/nvidia/p3450-0000/p3450-0000.c | 1 +
board/olimex/mx23_olinuxino/mx23_olinuxino.c | 1 +
board/phytec/pcl063/pcl063.c | 1 +
board/phytec/pcl063/spl.c | 1 +
board/phytec/pcm052/pcm052.c | 1 +
board/phytec/pcm058/pcm058.c | 1 +
board/phytec/pfla02/pfla02.c | 1 +
board/phytec/phycore_am335x_r2/board.c | 1 +
board/phytium/durian/durian.c | 1 +
board/ppcag/bg0900/bg0900.c | 1 +
board/qemu-mips/qemu-mips.c | 1 +
board/qualcomm/dragonboard410c/dragonboard410c.c | 1 +
board/qualcomm/dragonboard820c/dragonboard820c.c | 1 +
board/raidsonic/ib62x0/ib62x0.c | 1 +
board/raspberrypi/rpi/rpi.c | 1 +
board/renesas/MigoR/migo_r.c | 1 +
board/renesas/alt/alt.c | 1 +
board/renesas/blanche/blanche.c | 1 +
board/renesas/condor/condor.c | 1 +
board/renesas/draak/draak.c | 1 +
board/renesas/eagle/eagle.c | 1 +
board/renesas/ebisu/ebisu.c | 1 +
board/renesas/gose/gose.c | 1 +
board/renesas/grpeach/grpeach.c | 1 +
board/renesas/koelsch/koelsch.c | 1 +
board/renesas/lager/lager.c | 1 +
board/renesas/porter/porter.c | 1 +
board/renesas/r2dplus/r2dplus.c | 1 +
board/renesas/r7780mp/r7780mp.c | 1 +
board/renesas/rcar-common/common.c | 1 +
board/renesas/rcar-common/gen3-spl.c | 1 +
board/renesas/salvator-x/salvator-x.c | 1 +
board/renesas/sh7752evb/sh7752evb.c | 1 +
board/renesas/sh7753evb/sh7753evb.c | 1 +
board/renesas/sh7757lcr/sh7757lcr.c | 1 +
board/renesas/sh7763rdp/sh7763rdp.c | 1 +
board/renesas/silk/silk.c | 1 +
board/renesas/stout/stout.c | 1 +
board/renesas/ulcb/ulcb.c | 1 +
board/ronetix/pm9261/pm9261.c | 1 +
board/ronetix/pm9263/pm9263.c | 1 +
board/ronetix/pm9g45/pm9g45.c | 1 +
board/samsung/arndale/arndale.c | 1 +
board/samsung/common/board.c | 1 +
board/samsung/goni/goni.c | 1 +
board/samsung/smdkc100/smdkc100.c | 1 +
board/samsung/smdkv310/smdkv310.c | 1 +
board/samsung/universal_c210/universal.c | 1 +
board/sandbox/sandbox.c | 1 +
board/sandisk/sansa_fuze_plus/sfp.c | 1 +
board/sbc8349/sbc8349.c | 1 +
board/sbc8548/law.c | 1 +
board/sbc8548/sbc8548.c | 1 +
board/sbc8548/tlb.c | 1 +
board/sbc8641d/law.c | 1 +
board/sbc8641d/sbc8641d.c | 1 +
board/schulercontrol/sc_sps_1/sc_sps_1.c | 1 +
board/seco/mx6quq7/mx6quq7.c | 1 +
board/siemens/capricorn/board.c | 1 +
board/siemens/capricorn/spl.c | 1 +
board/siemens/common/board.c | 1 +
board/siemens/corvus/board.c | 1 +
board/siemens/draco/board.c | 1 +
board/siemens/pxm2/board.c | 1 +
board/siemens/rut/board.c | 1 +
board/siemens/smartweb/smartweb.c | 1 +
board/siemens/taurus/taurus.c | 1 +
board/sifive/fu540/fu540.c | 1 +
board/sipeed/maix/maix.c | 1 +
board/sks-kinkel/sksimx6/sksimx6.c | 1 +
board/socrates/law.c | 1 +
board/socrates/socrates.c | 1 +
board/socrates/tlb.c | 1 +
board/softing/vining_2000/vining_2000.c | 1 +
board/softing/vining_fpga/socfpga.c | 1 +
board/solidrun/clearfog/clearfog.c | 1 +
board/solidrun/mx6cuboxi/mx6cuboxi.c | 1 +
board/somlabs/visionsom-6ull/visionsom-6ull.c | 1 +
board/spear/spear300/spear300.c | 1 +
board/spear/spear310/spear310.c | 1 +
board/spear/spear320/spear320.c | 1 +
board/spear/spear600/spear600.c | 1 +
board/spear/x600/x600.c | 1 +
board/st/stih410-b2260/board.c | 1 +
board/st/stm32f429-discovery/stm32f429-discovery.c | 1 +
board/st/stm32f429-evaluation/stm32f429-evaluation.c | 1 +
board/st/stm32f469-discovery/stm32f469-discovery.c | 1 +
board/st/stm32f746-disco/stm32f746-disco.c | 1 +
board/st/stm32h743-disco/stm32h743-disco.c | 1 +
board/st/stm32h743-eval/stm32h743-eval.c | 1 +
board/st/stm32mp1/stm32mp1.c | 1 +
board/st/stv0991/stv0991.c | 1 +
board/ste/stemmy/stemmy.c | 1 +
board/sunxi/board.c | 1 +
board/syteco/zmx25/zmx25.c | 1 +
board/tbs/tbs2910/tbs2910.c | 1 +
board/tcl/sl50/board.c | 1 +
board/technexion/pico-imx6/pico-imx6.c | 1 +
board/technexion/pico-imx6/spl.c | 1 +
board/technexion/pico-imx6ul/pico-imx6ul.c | 1 +
board/technexion/pico-imx6ul/spl.c | 1 +
board/technexion/pico-imx7d/pico-imx7d.c | 1 +
board/technexion/pico-imx7d/spl.c | 1 +
board/technexion/pico-imx8mq/pico-imx8mq.c | 1 +
board/technexion/pico-imx8mq/spl.c | 1 +
board/technexion/tao3530/tao3530.c | 1 +
board/technologic/ts4600/ts4600.c | 1 +
board/technologic/ts4800/ts4800.c | 1 +
board/theadorable/theadorable.c | 1 +
board/ti/am335x/board.c | 1 +
board/ti/am3517crane/am3517crane.c | 1 +
board/ti/am43xx/board.c | 1 +
board/ti/am57xx/board.c | 1 +
board/ti/am65x/evm.c | 1 +
board/ti/beagle/beagle.c | 1 +
board/ti/dra7xx/evm.c | 1 +
board/ti/evm/evm.c | 1 +
board/ti/j721e/evm.c | 1 +
board/ti/ks2_evm/board.c | 1 +
board/ti/ks2_evm/board_k2g.c | 1 +
board/ti/omap5_uevm/evm.c | 1 +
board/ti/panda/panda.c | 1 +
board/ti/sdp4430/sdp.c | 1 +
board/ti/ti816x/evm.c | 1 +
board/timll/devkit3250/devkit3250.c | 1 +
board/timll/devkit8000/devkit8000.c | 1 +
board/toradex/apalis-imx8/apalis-imx8.c | 1 +
board/toradex/apalis-tk1/apalis-tk1.c | 1 +
board/toradex/apalis_imx6/apalis_imx6.c | 1 +
board/toradex/apalis_t30/apalis_t30.c | 1 +
board/toradex/colibri-imx6ull/colibri-imx6ull.c | 1 +
board/toradex/colibri-imx8x/colibri-imx8x.c | 1 +
board/toradex/colibri_imx6/colibri_imx6.c | 1 +
board/toradex/colibri_imx7/colibri_imx7.c | 1 +
board/toradex/colibri_pxa270/colibri_pxa270.c | 1 +
board/toradex/colibri_t20/colibri_t20.c | 1 +
board/toradex/colibri_t30/colibri_t30.c | 1 +
board/toradex/colibri_vf/colibri_vf.c | 1 +
board/toradex/common/tdx-common.c | 1 +
board/toradex/common/tdx-common.h | 1 +
board/toradex/verdin-imx8mm/spl.c | 1 +
board/toradex/verdin-imx8mm/verdin-imx8mm.c | 1 +
board/tqc/tqm834x/tqm834x.c | 1 +
board/tqc/tqma6/tqma6.c | 1 +
board/tqc/tqma6/tqma6_bb.h | 1 +
board/tqc/tqma6/tqma6_mba6.c | 1 +
board/tqc/tqma6/tqma6_wru4.c | 1 +
board/udoo/neo/neo.c | 1 +
board/udoo/udoo.c | 1 +
board/udoo/udoo_spl.c | 1 +
board/variscite/dart_6ul/dart_6ul.c | 1 +
board/variscite/dart_6ul/spl.c | 1 +
board/varisys/cyrus/cyrus.c | 1 +
board/varisys/cyrus/cyrus.h | 1 +
board/varisys/cyrus/ddr.c | 1 +
board/varisys/cyrus/eth.c | 1 +
board/varisys/cyrus/law.c | 1 +
board/varisys/cyrus/pci.c | 1 +
board/varisys/cyrus/tlb.c | 1 +
board/ve8313/ve8313.c | 1 +
board/vscom/baltos/board.c | 1 +
board/wandboard/spl.c | 1 +
board/wandboard/wandboard.c | 1 +
board/warp/warp.c | 1 +
board/warp7/warp7.c | 1 +
board/work-microwave/work_92105/work_92105.c | 1 +
board/xes/common/fsl_8xxx_clk.c | 1 +
board/xes/common/fsl_8xxx_misc.c | 1 +
board/xes/common/fsl_8xxx_pci.c | 1 +
board/xes/xpedite517x/ddr.c | 1 +
board/xes/xpedite517x/law.c | 1 +
board/xes/xpedite517x/xpedite517x.c | 1 +
board/xes/xpedite520x/law.c | 1 +
board/xes/xpedite520x/tlb.c | 1 +
board/xes/xpedite520x/xpedite520x.c | 1 +
board/xes/xpedite537x/ddr.c | 1 +
board/xes/xpedite537x/law.c | 1 +
board/xes/xpedite537x/tlb.c | 1 +
board/xes/xpedite537x/xpedite537x.c | 1 +
board/xes/xpedite550x/ddr.c | 1 +
board/xes/xpedite550x/law.c | 1 +
board/xes/xpedite550x/tlb.c | 1 +
board/xes/xpedite550x/xpedite550x.c | 1 +
board/xilinx/versal/board.c | 1 +
board/xilinx/zynq/board.c | 1 +
board/xilinx/zynq/cmds.c | 1 +
board/xilinx/zynqmp/zynqmp.c | 1 +
board/xilinx/zynqmp_r5/board.c | 1 +
board/zyxel/nsa310s/nsa310s.c | 1 +
cmd/bdinfo.c | 1 +
cmd/bedbug.c | 1 +
cmd/bootefi.c | 1 +
cmd/bootm.c | 1 +
cmd/bootz.c | 1 +
cmd/mmc.c | 1 +
cmd/reginfo.c | 1 +
cmd/spl.c | 1 +
common/board_f.c | 1 +
common/board_r.c | 1 +
common/bootm.c | 1 +
common/bootm_os.c | 1 +
common/image.c | 1 +
common/init/handoff.c | 1 +
drivers/ata/fsl_sata.c | 1 +
drivers/bootcount/bootcount_ram.c | 1 +
drivers/cpu/mpc83xx_cpu.c | 1 +
drivers/ddr/altera/sdram_agilex.c | 1 +
drivers/ddr/altera/sdram_s10.c | 1 +
drivers/ddr/altera/sdram_soc64.c | 1 +
drivers/ddr/fsl/arm_ddr_gen3.c | 1 +
drivers/ddr/fsl/ctrl_regs.c | 1 +
drivers/ddr/fsl/fsl_ddr_gen4.c | 1 +
drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 1 +
drivers/ddr/fsl/mpc85xx_ddr_gen2.c | 1 +
drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 1 +
drivers/ddr/fsl/options.c | 1 +
drivers/ddr/fsl/util.c | 1 +
drivers/dma/fsl_dma.c | 1 +
drivers/firmware/psci.c | 1 +
drivers/i2c/fsl_i2c.c | 1 +
drivers/input/i8042.c | 1 +
drivers/misc/fsl_ifc.c | 1 +
drivers/misc/fsl_portals.c | 1 +
drivers/misc/fsl_sec_mon.c | 1 +
drivers/mmc/davinci_mmc.c | 1 +
drivers/mmc/dw_mmc.c | 1 +
drivers/mmc/fsl_esdhc.c | 1 +
drivers/mmc/fsl_esdhc_imx.c | 1 +
drivers/mmc/mmc.c | 1 +
drivers/mmc/mvebu_mmc.c | 1 +
drivers/mmc/mxcmmc.c | 1 +
drivers/mmc/mxsmmc.c | 1 +
drivers/mtd/altera_qspi.c | 1 +
drivers/mtd/cfi_flash.c | 1 +
drivers/mtd/nand/raw/nand_bbt.c | 1 +
drivers/mtd/onenand/onenand_bbt.c | 1 +
drivers/mtd/renesas_rpc_hf.c | 1 +
drivers/net/ag7xxx.c | 1 +
drivers/net/armada100_fec.c | 1 +
drivers/net/at91_emac.c | 1 +
drivers/net/ax88180.c | 1 +
drivers/net/bcm-sf2-eth.c | 1 +
drivers/net/calxedaxgmac.c | 1 +
drivers/net/dc2114x.c | 1 +
drivers/net/designware.c | 1 +
drivers/net/dm9000x.c | 1 +
drivers/net/dnet.c | 1 +
drivers/net/e1000.c | 1 +
drivers/net/eepro100.c | 1 +
drivers/net/ep93xx_eth.c | 1 +
drivers/net/ethoc.c | 1 +
drivers/net/fec_mxc.c | 1 +
drivers/net/fec_mxc.h | 1 +
drivers/net/fm/eth.c | 1 +
drivers/net/fm/init.c | 1 +
drivers/net/fm/memac_phy.c | 1 +
drivers/net/fm/tgec_phy.c | 1 +
drivers/net/fsl-mc/dpio/qbman_private.h | 1 +
drivers/net/fsl-mc/mc.c | 1 +
drivers/net/fsl_mcdmafec.c | 1 +
drivers/net/fsl_mdio.c | 1 +
drivers/net/ftmac100.c | 1 +
drivers/net/ftmac110.c | 1 +
drivers/net/ks8851_mll.c | 1 +
drivers/net/lan91c96.c | 1 +
drivers/net/ldpaa_eth/ldpaa_eth.c | 1 +
drivers/net/lpc32xx_eth.c | 1 +
drivers/net/macb.c | 1 +
drivers/net/mcffec.c | 1 +
drivers/net/mpc8xx_fec.c | 1 +
drivers/net/mvgbe.c | 1 +
drivers/net/natsemi.c | 1 +
drivers/net/ne2000_base.c | 1 +
drivers/net/ns8382x.c | 1 +
drivers/net/pcnet.c | 1 +
drivers/net/pfe_eth/pfe_driver.c | 1 +
drivers/net/rtl8139.c | 1 +
drivers/net/rtl8169.c | 1 +
drivers/net/sh_eth.c | 1 +
drivers/net/smc91111.c | 1 +
drivers/net/smc911x.c | 1 +
drivers/net/ti/cpsw.c | 1 +
drivers/net/tsec.c | 1 +
drivers/net/uli526x.c | 1 +
drivers/net/vsc9953.c | 1 +
drivers/pci/pci-emul-uclass.c | 1 +
drivers/pci/pci-uclass.c | 1 +
drivers/pci/pcie_layerscape.c | 1 +
drivers/pci/pcie_layerscape_ep.c | 1 +
drivers/pci/pcie_layerscape_fixup.c | 1 +
drivers/pci/pcie_layerscape_fixup_common.c | 1 +
drivers/pci/pcie_layerscape_fixup_common.h | 1 +
drivers/pci/pcie_layerscape_gen4_fixup.c | 1 +
drivers/pci/pcie_layerscape_rc.c | 1 +
drivers/qe/uec.c | 1 +
drivers/rtc/ds174x.c | 1 +
drivers/rtc/mc146818.c | 1 +
drivers/rtc/mk48t59.c | 1 +
drivers/spi/fsl_espi.c | 1 +
drivers/sysreset/sysreset_sandbox.c | 1 +
drivers/timer/mpc83xx_timer.c | 1 +
drivers/timer/tsc_timer.c | 1 +
drivers/usb/common/fsl-dt-fixup.c | 1 +
drivers/usb/common/fsl-errata.c | 1 +
drivers/usb/eth/asix.c | 1 +
drivers/usb/eth/asix88179.c | 1 +
drivers/usb/eth/mcs7830.c | 1 +
drivers/usb/eth/r8152.c | 1 +
drivers/usb/eth/smsc95xx.c | 1 +
drivers/usb/gadget/ether.c | 1 +
drivers/usb/host/ehci-marvell.c | 1 +
drivers/video/cfb_console.c | 1 +
drivers/video/fsl_dcu_fb.c | 1 +
drivers/video/fsl_diu_fb.c | 1 +
drivers/video/meson/meson_vpu.c | 1 +
drivers/video/sunxi/sunxi_de2.c | 1 +
drivers/video/sunxi/sunxi_display.c | 1 +
include/asm-generic/global_data.h | 1 +
include/asm-generic/u-boot.h | 1 +
include/button.h | 2 ++
include/clock_legacy.h | 1 +
include/common.h | 1 -
include/fdtdec.h | 1 +
include/fm_eth.h | 1 +
include/fsl-mc/fsl_mc.h | 1 +
include/fsl_ddr_sdram.h | 1 +
include/fsl_errata.h | 1 +
include/fsl_esdhc.h | 1 +
include/fsl_esdhc_imx.h | 1 +
include/fsl_mdio.h | 1 +
include/mmc.h | 1 +
include/mvebu_mmc.h | 1 +
include/net.h | 1 +
include/net/pfe_eth/pfe_eth.h | 1 +
include/netdev.h | 1 +
include/post.h | 3 +++
include/tsec.h | 1 +
include/vsc9953.h | 1 +
lib/asm-offsets.c | 1 +
lib/efi_loader/efi_boottime.c | 1 +
lib/efi_loader/efi_memory.c | 1 +
lib/fdtdec.c | 1 +
lib/lmb.c | 1 +
net/eth_legacy.c | 1 +
post/cpu/mpc83xx/ecc.c | 1 +
post/drivers/memory.c | 1 +
test/dm/pci.c | 1 +
1088 files changed, 1095 insertions(+), 6 deletions(-)
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 8a8d394a5f0..60c6fe9d55b 100644
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index 8b83822fac8..6926c6eb44c 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -10,6 +10,7 @@
#include <asm/arcregs.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c
index db21fbb1142..acc6792ea7a 100644
--- a/arch/arc/lib/interrupts.c
+++ b/arch/arc/lib/interrupts.c
@@ -7,6 +7,7 @@
#include <irq_func.h>
#include <asm/arcregs.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
/* Bit values in STATUS32 */
#define E1_MASK (1 << 1) /* Level 1 interrupts enable */
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index 99e7ec0744f..b0dccac64b6 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/crm_regs.h>
diff --git a/arch/arm/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c
index ece09c83a4a..3deb2eb6298 100644
--- a/arch/arm/cpu/arm720t/cpu.c
+++ b/arch/arm/cpu/arm720t/cpu.c
@@ -9,6 +9,8 @@
* Alex Zuepke <azu at sysgo.de>
*/
+#include <asm/u-boot.h>
+
/*
* cleanup_before_linux() - Prepare the CPU to jump to Linux
*
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index 96726b3144e..e271ae473f4 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <asm/arch/cpu.h>
#include <asm/arch/armada100.h>
+#include <asm/u-boot.h>
#define UARTCLK14745KHZ (APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
#define SET_MRVL_ID (1<<8)
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index c97b5b1940a..966bdc67ea6 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -11,6 +11,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/armada100.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 9cd60abcccb..5b745880b9c 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -20,6 +20,7 @@
#include <asm/arch-imx/cpu.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_FSL_ESDHC_IMX
#include <fsl_esdhc_imx.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 8b9d3a272af..0c804b8bad2 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -17,6 +17,7 @@
#ifdef CONFIG_MMC_MXC
#include <asm/arch/mxcmmc.h>
#endif
+#include <asm/u-boot.h>
/*
* get the system pll clock in Hz
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 91ea4f02d02..8d5a3d75053 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -16,6 +16,7 @@
#include <init.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 35f503f93b0..f24378305fc 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -16,6 +16,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/string.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 93fd7a6d8df..e181fe65d13 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_misc.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
int arch_cpu_init(void)
diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index 08b98a2d068..2ef53110ebc 100644
--- a/arch/arm/cpu/arm926ejs/spear/spl.c
+++ b/arch/arm/cpu/arm926ejs/spear/spl.c
@@ -16,6 +16,7 @@
#include <asm/arch/spr_defs.h>
#include <asm/arch/spr_misc.h>
#include <asm/arch/spr_syscntl.h>
+#include <asm/u-boot.h>
#include <linux/mtd/st_smi.h>
/* Reserve some space to store the BootROM's stack pointer during SPL operation.
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index a910b7134f3..5af983cd1c7 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/mtd/st_smi.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
index 68807d20997..8d1f91cd439 100644
--- a/arch/arm/cpu/armv7/cpu.c
+++ b/arch/arm/cpu/armv7/cpu.c
@@ -21,6 +21,7 @@
#include <asm/system.h>
#include <asm/cache.h>
#include <asm/armv7.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
void __weak cpu_cache_initialization(void){}
diff --git a/arch/arm/cpu/armv7/kona-common/s_init.c b/arch/arm/cpu/armv7/kona-common/s_init.c
index 778b9176fa2..5b998b62854 100644
--- a/arch/arm/cpu/armv7/kona-common/s_init.c
+++ b/arch/arm/cpu/armv7/kona-common/s_init.c
@@ -3,6 +3,7 @@
* Copyright 2014 Broadcom Corporation.
*/
+#include <asm/u-boot.h>
/*
* Early system init. Currently empty.
*/
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index 940995ef5af..3b59dd9657e 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -10,6 +10,7 @@
#include <asm/arch/immap_ls102xa.h>
#include <asm/arch/clock.h>
#include <fsl_ifc.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index cbc8254b42a..61b80261f52 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -19,6 +19,7 @@
#include <fsl_esdhc.h>
#include <config.h>
#include <fsl_wdog.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "fsl_epu.h"
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index b2e80751a98..0ab9e9092d0 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -7,6 +7,7 @@
#include <clock_legacy.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c
index 8a95ee86a9b..175909b2a44 100644
--- a/arch/arm/cpu/armv7/ls102xa/soc.c
+++ b/arch/arm/cpu/armv7/ls102xa/soc.c
@@ -13,6 +13,7 @@
#include <asm/arch/ls102xa_stream_id.h>
#include <fsl_csu.h>
#include <fsl_ddr_sdram.h>
+#include <asm/u-boot.h>
struct liodn_id_table sec_liodn_tbl[] = {
SET_SEC_JR_LIODN_ENTRY(0, 0x10, 0x10),
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index fb2920950d4..7382046517a 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -10,6 +10,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/clk.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 8141f40d5c0..777a119438a 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -14,6 +14,7 @@
#include <asm/io.h>
#include <asm/arch/pwm.h>
#include <asm/arch/clk.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
/* Use the old PWM interface for now */
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 3f266178c98..83459204a8f 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -21,6 +21,7 @@
#ifdef CONFIG_FSL_ESDHC_IMX
#include <fsl_esdhc_imx.h>
#endif
+#include <asm/u-boot.h>
#include <linux/string.h>
#ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c
index 7f827da033b..1d1c629c44c 100644
--- a/arch/arm/cpu/armv7m/cpu.c
+++ b/arch/arm/cpu/armv7m/cpu.c
@@ -12,6 +12,7 @@
#include <irq_func.h>
#include <asm/io.h>
#include <asm/armv7m.h>
+#include <asm/u-boot.h>
/*
* This is called right before passing control to
diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index 21c10cf6c7c..8c0a492a3fa 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -17,6 +17,7 @@
#include <asm/cache.h>
#include <asm/system.h>
#include <asm/secure.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/string.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 5839f0b9c9e..f19b02dc473 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -17,6 +17,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/system.h>
#include <fm_eth.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index ab4f4a5eb1a..0553faf90e0 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -9,6 +9,7 @@
#include <efi_loader.h>
#include <log.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <phy.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index 63d34e1ec03..26c3b5b79e5 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -8,6 +8,7 @@
#include <clock_legacy.h>
#include <cpu_func.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/io.h>
#include <asm/processor.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 767359fa5bd..2eafcc19a00 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -10,6 +10,7 @@
#include <clock_legacy.h>
#include <cpu_func.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <fsl_ifc.h>
#include <asm/processor.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 8675007da51..10fc75412d3 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -13,6 +13,7 @@
#include <asm/system.h>
#include <asm/arch/mp.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "cpu.h"
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index fde893e8c9b..dbc6f9f14c4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -11,6 +11,7 @@
#include <fsl_immap.h>
#include <fsl_ifc.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <log.h>
#include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 7c44dc7a95a..5ba5db3223a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -20,6 +20,7 @@
#include <asm/arch/fdt.h>
#include <asm/arch/ppa.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c
index 8ee3adc8058..b26298553bb 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.c
+++ b/arch/arm/cpu/armv8/s32v234/cpu.c
@@ -12,6 +12,7 @@
#include <asm/armv8/mmu.h>
#include <asm/io.h>
#include <asm/arch/mc_me_regs.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include "cpu.h"
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 0fc98852228..5a49a8a4a0d 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -18,6 +18,7 @@
#include <netdev.h>
#include <div64.h>
#include <errno.h>
+#include <asm/u-boot.h>
u32 get_cpu_rev(void)
{
diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
index ea91d8aaec2..9a8b2361ad9 100644
--- a/arch/arm/cpu/pxa/pxa2xx.c
+++ b/arch/arm/cpu/pxa/pxa2xx.c
@@ -18,6 +18,7 @@
#include <asm/io.h>
#include <asm/system.h>
#include <command.h>
+#include <asm/u-boot.h>
/* Flush I/D-cache */
static void cache_flush(void)
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/clock.h b/arch/arm/include/asm/arch-fsl-layerscape/clock.h
index d5616914374..41272e44bf3 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/clock.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/clock.h
@@ -8,6 +8,7 @@
#ifndef __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
#define __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
+#include <asm/u-boot.h>
enum mxc_clock {
MXC_ARM_CLK = 0,
MXC_BUS_CLK,
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
index c9be0768e34..ae0504652bf 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
@@ -8,6 +8,7 @@
#include <fsl_immap.h>
#ifndef __ASSEMBLY__
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#endif
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/speed.h b/arch/arm/include/asm/arch-fsl-layerscape/speed.h
index 26721699cc0..9d8d4065159 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/speed.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/speed.h
@@ -5,6 +5,7 @@
#ifndef _FSL_LAYERSCAPE_SPEED_H
#define _FSL_LAYERSCAPE_SPEED_H
+#include <asm/u-boot.h>
void get_sys_info(struct sys_info *sys_info);
#ifdef CONFIG_SYS_DPAA_QBMAN
unsigned long get_qman_freq(void);
diff --git a/arch/arm/include/asm/arch-ls102xa/clock.h b/arch/arm/include/asm/arch-ls102xa/clock.h
index 01978c08f5e..bfb58d75455 100644
--- a/arch/arm/include/asm/arch-ls102xa/clock.h
+++ b/arch/arm/include/asm/arch-ls102xa/clock.h
@@ -7,6 +7,7 @@
#ifndef __ASM_ARCH_LS102XA_CLOCK_H_
#define __ASM_ARCH_LS102XA_CLOCK_H_
+#include <asm/u-boot.h>
enum mxc_clock {
MXC_ARM_CLK = 0,
MXC_UART_CLK,
diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
index f2ba182346e..4bae3f4ed5d 100644
--- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
+++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
@@ -6,6 +6,7 @@
#ifndef __ASM_ARCH_LS102XA_IMMAP_H_
#define __ASM_ARCH_LS102XA_IMMAP_H_
#include <fsl_immap.h>
+#include <asm/u-boot.h>
#define SVR_MAJ(svr) (((svr) >> 4) & 0xf)
#define SVR_MIN(svr) (((svr) >> 0) & 0xf)
diff --git a/arch/arm/include/asm/arch-mx27/mxcmmc.h b/arch/arm/include/asm/arch-mx27/mxcmmc.h
index 52fb0ab5782..bf85a128bc7 100644
--- a/arch/arm/include/asm/arch-mx27/mxcmmc.h
+++ b/arch/arm/include/asm/arch-mx27/mxcmmc.h
@@ -6,6 +6,7 @@
#ifndef ASM_ARCH_MXCMMC_H
#define ASM_ARCH_MXCMMC_H
+#include <asm/u-boot.h>
int mxc_mmc_init(struct bd_info *bis);
#endif
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h
index 29fc0fda0e6..a530afcbc91 100644
--- a/arch/arm/include/asm/arch-mx31/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -8,6 +8,7 @@
#define _MX31_SYS_PROTO_H_
#include <asm/mach-imx/sys_proto.h>
+#include <asm/u-boot.h>
struct mxc_weimcs {
u32 upper;
diff --git a/arch/arm/include/asm/arch-mx6/litesom.h b/arch/arm/include/asm/arch-mx6/litesom.h
index 37a16d2c309..43adf8f422d 100644
--- a/arch/arm/include/asm/arch-mx6/litesom.h
+++ b/arch/arm/include/asm/arch-mx6/litesom.h
@@ -6,6 +6,7 @@
#ifndef __ARCH_ARM_MX6UL_LITESOM_H__
#define __ARCH_ARM_MX6UL_LITESOM_H__
+#include <asm/u-boot.h>
int litesom_mmc_init(struct bd_info *bis);
#ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 20ee863ac7e..85374e2b87c 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -10,6 +10,7 @@
#define __MXS_SYS_PROTO_H__
#include <asm/mach-imx/sys_proto.h>
+#include <asm/u-boot.h>
int mxsmmc_initialize(struct bd_info *bis, int id, int (*wp)(int),
int (*cd)(int));
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index ab94024c9b8..ae33d6a9a49 100644
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/mach-imx/regs-common.h>
#include <asm/mach-imx/module_fuse.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include "../arch-imx/cpu.h"
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index de8fc99d047..25789677378 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -10,6 +10,7 @@
#ifndef __ASSEMBLY__
+#include <asm/u-boot.h>
#include <linux/types.h>
#define NUM_SYS_CLKS 7
diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index 572f7fb2429..73b9ed0815a 100644
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index e1970ea9f14..72a86f7defe 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -22,6 +22,7 @@
#include <asm/global_data.h>
#include <asm/psci.h>
#include <asm/spin_table.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 101f9d9b3ae..9dbca39b52a 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -20,6 +20,7 @@
#include <lmb.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/root.h>
#include <env.h>
#include <image.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 24050e5bdd3..d33136a9dbc 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -10,6 +10,7 @@
#include <asm/global_data.h>
#include <asm/system.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/armv7_mpu.h>
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index e394c1ad909..7194bf08b44 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -8,6 +8,7 @@
#include <image.h>
#include <mapmem.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/sizes.h>
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index c653e67db28..1da953af8c8 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -8,6 +8,7 @@
#include <asm/global_data.h>
#include <asm/ptrace.h>
#include <irq_func.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <efi_loader.h>
diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c
index 2ae1c5ba76c..cb456f846f7 100644
--- a/arch/arm/lib/interrupts_m.c
+++ b/arch/arm/lib/interrupts_m.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <cpu_func.h>
#include <irq_func.h>
+#include <asm/u-boot.h>
/*
* Upon exception entry ARMv7-M processors automatically save stack
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index 4f1a768bfe1..109ed120482 100644
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -24,6 +24,7 @@
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
__weak void reset_misc(void)
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index b2b54f28fc4..2dbbc53c516 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -15,6 +15,7 @@
#include <image.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c
index 2d1d27bfa2e..88b063def40 100644
--- a/arch/arm/mach-aspeed/ast2500-board.c
+++ b/arch/arm/mach-aspeed/ast2500-board.c
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <asm/arch/timer.h>
#include <asm/arch/wdt.h>
+#include <asm/u-boot.h>
#include <linux/err.h>
#include <dm/uclass.h>
diff --git a/arch/arm/mach-at91/arm920t/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c
index 44c079c0fdd..55e072e38be 100644
--- a/arch/arm/mach-at91/arm920t/cpu.c
+++ b/arch/arm/mach-at91/arm920t/cpu.c
@@ -15,6 +15,7 @@
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/clk.h>
+#include <asm/u-boot.h>
#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
#define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
index 761edb6df58..8a20be467aa 100644
--- a/arch/arm/mach-at91/arm926ejs/cpu.c
+++ b/arch/arm/mach-at91/arm926ejs/cpu.c
@@ -14,6 +14,7 @@
#include <asm/arch/at91_pit.h>
#include <asm/arch/at91_gpbr.h>
#include <asm/arch/clk.h>
+#include <asm/u-boot.h>
#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
#define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index a8f4356ce94..d04d10447c7 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -17,6 +17,7 @@
#include <asm/arch/at91_pit.h>
#include <asm/arch/at91_gpbr.h>
#include <asm/arch/clk.h>
+#include <asm/u-boot.h>
#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
#define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index 23588e79f94..526379fae1a 100644
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -16,6 +16,7 @@
#include <asm/arch/at91_wdt.h>
#include <asm/arch/clk.h>
#include <spl.h>
+#include <asm/u-boot.h>
static void switch_to_main_crystal_osc(void)
{
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index b2708e4876e..c80c77e0fcc 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -10,6 +10,7 @@
#include <cpu_func.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/device.h>
#include <fdt_support.h>
diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c
index aefd21dc458..79946b901b1 100644
--- a/arch/arm/mach-davinci/cpu.c
+++ b/arch/arm/mach-davinci/cpu.c
@@ -9,6 +9,7 @@
#include <asm/arch/hardware.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c
index 07bf19b5e42..bb3f616d0b3 100644
--- a/arch/arm/mach-davinci/da850_lowlevel.c
+++ b/arch/arm/mach-davinci/da850_lowlevel.c
@@ -16,6 +16,7 @@
#include <asm/arch/ddr2_defs.h>
#include <asm/ti-common/davinci_nand.h>
#include <asm/arch/pll_defs.h>
+#include <asm/u-boot.h>
void davinci_enable_uart0(void)
{
diff --git a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
index d4195cf588d..e1851c5ae4e 100644
--- a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
+++ b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
@@ -9,6 +9,7 @@
#define _SDMMC_DEFS_H_
#include <asm/arch/hardware.h>
+#include <asm/u-boot.h>
/* MMC Control Reg fields */
#define MMCCTL_DATRST (1 << 0)
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 90b38b7e020..7324af07d6b 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -18,6 +18,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/davinci_misc.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 97d6ca8fc2a..7a2fe744527 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -36,6 +36,7 @@
#include <asm/arch/pinmux.h>
#include <asm/arch/system.h>
#include <asm/armv7.h>
+#include <asm/u-boot.h>
#include "common_setup.h"
#include "exynos5_setup.h"
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index dc182eb12d2..80a4ae4d92a 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <net.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 9eb38cac029..0df61fca476 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -15,6 +15,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/arch/image.h>
#include <console.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 293c931b2ff..71686cd07ed 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/uclass.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 94da4d0951d..6c473ddcc9c 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -8,6 +8,7 @@
#include <asm/arch/sci/sci.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/ofnode.h>
#include <fdt_support.h>
#include <linux/libfdt.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 5e714b2973c..7bcf573d170 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -19,6 +19,7 @@
#include <asm/mach-imx/syscounter.h>
#include <asm/ptrace.h>
#include <asm/armv8/mmu.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <efi_loader.h>
#include <env.h>
diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
index 8e7d15160da..0ac64e883f7 100644
--- a/arch/arm/mach-imx/imxrt/soc.c
+++ b/arch/arm/mach-imx/imxrt/soc.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <asm/io.h>
#include <asm/armv7_mpu.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
int arch_cpu_init(void)
diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c
index d82efa7f8f0..e30e87d3aa0 100644
--- a/arch/arm/mach-imx/misc.c
+++ b/arch/arm/mach-imx/misc.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx5/mx53_dram.c b/arch/arm/mach-imx/mx5/mx53_dram.c
index f7441441947..f9b7762a356 100644
--- a/arch/arm/mach-imx/mx5/mx53_dram.c
+++ b/arch/arm/mach-imx/mx5/mx53_dram.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 699a3dc317f..17108a83981 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -19,6 +19,7 @@
#include <asm/io.h>
#include <common.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <mmc.h>
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index 0305b2a7e02..ced49dcad33 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -9,6 +9,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/module_fuse.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index e9d78740a15..67b8c65963d 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <common.h>
#include <env.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index e1292860656..ef031364fbf 100644
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 798fe74a3d6..36f3f8f945b 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -19,6 +19,7 @@
#include <imx_thermal.h>
#include <fsl_sec.h>
#include <asm/setup.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#define IOMUXC_GPR1 0x4
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 8dd6b4d40e7..07e8ff917c6 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -13,6 +13,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/hab.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#define PMC0_BASE_ADDR 0x410a1000
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 578b510e780..1ba86223c6a 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -19,6 +19,7 @@
#include <asm/mach-imx/hab.h>
#include <asm/mach-imx/boot_mode.h>
#include <g_dnl.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index 88e8912959f..d578b194ea8 100644
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -16,6 +16,7 @@
#include <asm/arch/clock.h>
#include <asm/arch/hardware.h>
#include <asm/arch/psc_defs.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#define MAX_PCI_PORTS 2
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index 551c22a8ea1..beee83b2249 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -18,6 +18,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <mvebu_mmc.h>
+#include <asm/u-boot.h>
void reset_cpu(unsigned long ignored)
{
diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
index 32af6206056..df500620761 100644
--- a/arch/arm/mach-lpc32xx/cpu.c
+++ b/arch/arm/mach-lpc32xx/cpu.c
@@ -13,6 +13,7 @@
#include <asm/arch/wdt.h>
#include <asm/arch/sys_proto.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
static struct wdt_regs *wdt = (struct wdt_regs *)WDT_BASE;
diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c
index c329e7cc98a..58d2c26d206 100644
--- a/arch/arm/mach-mediatek/cpu.c
+++ b/arch/arm/mach-mediatek/cpu.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <init.h>
#include <wdt.h>
+#include <asm/u-boot.h>
#include <dm/uclass-internal.h>
int arch_cpu_init(void)
diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
index c14e7d22e6f..5a126d317c1 100644
--- a/arch/arm/mach-mediatek/mt8512/init.c
+++ b/arch/arm/mach-mediatek/mt8512/init.c
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/sections.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <dt-bindings/clock/mt8512-clk.h>
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 0eb65aa76b5..0f79bfca952 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -17,6 +17,7 @@
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/sections.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <dt-bindings/clock/mt8516-clk.h>
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index 28b00c3dec8..27087e6eb8c 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -18,6 +18,7 @@
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/sections.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <dt-bindings/clock/mt8518-clk.h>
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 2e1dcf0e010..67d85d4e1ce 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -12,6 +12,7 @@
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <linux/err.h>
#include <asm/arch/mem.h>
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index fa687d8abbb..68c5849e2c4 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -10,6 +10,7 @@
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <linux/sizes.h>
#include <pci.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index 7ab5c653f1e..f16addcc816 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -10,6 +10,7 @@
#include <fdtdec.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/libfdt.h>
#include <asm/io.h>
diff --git a/arch/arm/mach-mvebu/armada8k/dram.c b/arch/arm/mach-mvebu/armada8k/dram.c
index bab375e18ac..445bdd01d8e 100644
--- a/arch/arm/mach-mvebu/armada8k/dram.c
+++ b/arch/arm/mach-mvebu/armada8k/dram.c
@@ -9,6 +9,7 @@
#include <asm/global_data.h>
#include <asm/ptrace.h>
#include <asm/system.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 7dce11e77f3..19886c5f139 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -7,6 +7,7 @@
#include <ahci.h>
#include <cpu_func.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/mbus.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index 349e0cc4c18..0f17c2504f8 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_ARCH_MVEBU)
/* Use common XOR definitions for A3x and AXP */
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index cff8c205734..0b0372e22ca 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -33,6 +33,7 @@
#include <i2c.h>
#include <miiphy.h>
#include <cpsw.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/compiler.h>
diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c
index 2ec30b1f9c3..2b4fd731db0 100644
--- a/arch/arm/mach-omap2/am33xx/fdt.c
+++ b/arch/arm/mach-omap2/am33xx/fdt.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <hang.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <malloc.h>
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index 05efe04dc35..b8fba785a96 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -19,6 +19,7 @@
#include <watchdog.h>
#include <scsi.h>
#include <i2c.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c
index 5eb04473123..b122db8bf7a 100644
--- a/arch/arm/mach-omap2/fdt-common.c
+++ b/arch/arm/mach-omap2/fdt-common.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 3da50f974dc..b6be35b0647 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -17,6 +17,7 @@
#include <spl.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/emif.h>
#include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c
index 1b246f844a8..5034404801a 100644
--- a/arch/arm/mach-omap2/omap-cache.c
+++ b/arch/arm/mach-omap2/omap-cache.c
@@ -16,6 +16,7 @@
#include <log.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index c741652f241..0603110ef98 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -27,6 +27,7 @@
#include <asm/armv7.h>
#include <asm/gpio.h>
#include <asm/omap_common.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c
index d0d0b7a75a6..4c102dadf42 100644
--- a/arch/arm/mach-omap2/omap3/emac.c
+++ b/arch/arm/mach-omap2/omap3/emac.c
@@ -10,6 +10,7 @@
#include <net.h>
#include <asm/io.h>
#include <asm/arch/am35x_def.h>
+#include <asm/u-boot.h>
/*
* Initializes on-chip ethernet controllers.
diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index df6e9ce1d6c..dd99aeb63bd 100644
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -16,6 +16,7 @@
#include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/emif4.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c
index 4d85b1dee99..78456f03f98 100644
--- a/arch/arm/mach-omap2/omap3/sdrc.c
+++ b/arch/arm/mach-omap2/omap3/sdrc.c
@@ -27,6 +27,7 @@
#include <asm/io.h>
#include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index c4162420f3a..bf4f015cf52 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <hang.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <malloc.h>
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index beae7b84843..aef39986006 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -15,6 +15,7 @@
#include <netdev.h>
#include <asm/cache.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <u-boot/md5.h>
#include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index c9a3750e48d..5e6f51de5c4 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -13,6 +13,7 @@
#include <init.h>
#include <asm/arch/cpu.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index 4d2b9d0b0eb..37c6683959d 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/arm-smccc.h>
#include <linux/psci.h>
#include <common.h>
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index fdbbd72e285..88de2781626 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <asm/io.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#ifdef CONFIG_ARCH_CPU_INIT
diff --git a/arch/arm/mach-rmobile/emac.c b/arch/arm/mach-rmobile/emac.c
index cb9bce0cf23..2066ab7796e 100644
--- a/arch/arm/mach-rmobile/emac.c
+++ b/arch/arm/mach-rmobile/emac.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <netdev.h>
diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c
index a68eb806b35..7d5657a778d 100644
--- a/arch/arm/mach-rmobile/memmap-gen3.c
+++ b/arch/arm/mach-rmobile/memmap-gen3.c
@@ -9,6 +9,7 @@
#include <cpu_func.h>
#include <asm/armv8/mmu.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#define GEN3_NR_REGIONS 16
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 2c41e58f598..5a02f6c3f55 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -17,6 +17,7 @@
#include <asm/arch-rockchip/clock.h>
#include <asm/arch-rockchip/periph.h>
#include <asm/arch-rockchip/misc.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <power/regulator.h>
diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
index 6fcef63c1b0..f11424d105b 100644
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@@ -13,6 +13,7 @@
#include <asm/arch-rockchip/uart.h>
#include <asm/arch-rockchip/clock.h>
#include <asm/arch-rockchip/cru_px30.h>
+#include <asm/u-boot.h>
#include <dt-bindings/clock/px30-cru.h>
static struct mm_region px30_mem_map[] = {
diff --git a/arch/arm/mach-rockchip/rk3128/rk3128.c b/arch/arm/mach-rockchip/rk3128/rk3128.c
index 01dbfa75cb2..ef2f50866a2 100644
--- a/arch/arm/mach-rockchip/rk3128/rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/rk3128.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index 1338979febb..1a6750d39b1 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -14,6 +14,7 @@
#include <asm/arch-rockchip/clock.h>
#include <asm/arch-rockchip/grf_rk3188.h>
#include <asm/arch-rockchip/hardware.h>
+#include <asm/u-boot.h>
#include <linux/err.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-rockchip/rk322x/rk322x.c b/arch/arm/mach-rockchip/rk322x/rk322x.c
index ad4ac62e514..f94b8c8129c 100644
--- a/arch/arm/mach-rockchip/rk322x/rk322x.c
+++ b/arch/arm/mach-rockchip/rk322x/rk322x.c
@@ -7,6 +7,7 @@
#include <asm/arch-rockchip/bootrom.h>
#include <asm/arch-rockchip/grf_rk322x.h>
#include <asm/arch-rockchip/hardware.h>
+#include <asm/u-boot.h>
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 30020000",
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index bc20bc5ab90..d54eedb6a58 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -21,6 +21,7 @@
#include <asm/arch-rockchip/pmu_rk3288.h>
#include <asm/arch-rockchip/qos_rk3288.h>
#include <asm/arch-rockchip/sdram.h>
+#include <asm/u-boot.h>
#include <linux/err.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index 70fe0d0ac35..5d5c44b8ea5 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -11,6 +11,7 @@
#include <asm/arch-rockchip/hardware.h>
#include <asm/gpio.h>
#include <debug_uart.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
index ec3336cb49a..6d49d28e059 100644
--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
@@ -12,6 +12,7 @@
#include <asm/armv8/mmu.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index 9b7132d471c..fef8bfc476a 100644
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -15,6 +15,7 @@
#include <asm/arch-rockchip/cru_rk3368.h>
#include <asm/arch-rockchip/grf_rk3368.h>
#include <asm/arch-rockchip/hardware.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index f8f6799a7fd..79d3045beb3 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -18,6 +18,7 @@
#include <asm/arch-rockchip/gpio.h>
#include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch-rockchip/hardware.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/printk.h>
#include <power/regulator.h>
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index ed07ece15a4..40335b8d208 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -11,6 +11,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch-rockchip/sdram.h>
+#include <asm/u-boot.h>
#include <dm/uclass-internal.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 4b5c22dc138..6c8ab3192b3 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -15,6 +15,7 @@
#include <asm/arch-rockchip/bootrom.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index bdd5b863c45..0e5d68ede98 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -14,6 +14,7 @@
#include <asm/arch/misc.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <usb.h>
#include <usb/dwc2_udc.h>
diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c
index f0b15f770cc..017af139bc9 100644
--- a/arch/arm/mach-socfpga/clock_manager.c
+++ b/arch/arm/mach-socfpga/clock_manager.c
@@ -10,6 +10,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/clock_manager.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 6813279e6ae..52226d549c7 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -13,6 +13,7 @@
#include <asm/io.h>
#include <errno.h>
#include <fdtdec.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <altera.h>
#include <miiphy.h>
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
index bf978053ca6..20394a5f6b3 100644
--- a/arch/arm/mach-socfpga/misc_arria10.c
+++ b/arch/arm/mach-socfpga/misc_arria10.c
@@ -21,6 +21,7 @@
#include <asm/arch/nic301.h>
#include <asm/io.h>
#include <asm/pl310.h>
+#include <asm/u-boot.h>
#define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q1_3 0x08
#define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q2_11 0x58
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 4edf4f9b5c1..fefb79a8486 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -11,6 +11,7 @@
#include <env.h>
#include <errno.h>
#include <fdtdec.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/libfdt.h>
#include <altera.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 1e9a3f62059..461f0d189b1 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -19,6 +19,7 @@
#include <asm/arch/system_manager.h>
#include <asm/arch/misc.h>
#include <asm/pl310.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <asm/arch/mailbox_s10.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
index 1f12da401c1..3ae6b7c4e9b 100644
--- a/arch/arm/mach-stm32/soc.c
+++ b/arch/arm/mach-stm32/soc.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <asm/io.h>
#include <asm/armv7_mpu.h>
+#include <asm/u-boot.h>
int arch_cpu_init(void)
{
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 02923c80802..54ea1606515 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -12,6 +12,7 @@
#include <part.h>
#include <asm/arch/stm32mp1_smc.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <jffs2/load_kernel.h>
#include <linux/list.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index cd27a774d44..9c49e8fe684 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -16,6 +16,7 @@
#include <asm/arch/bsec.h>
#include <asm/arch/stm32.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <dm/device.h>
#include <dm/uclass.h>
#include <linux/bitops.h>
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 611e0ff0eb7..36f07eacaab 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <ram.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 5a7d761586c..ded804403e3 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <tee.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <dt-bindings/pinctrl/stm32-pinfunc.h>
#include <linux/io.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index ab467de231a..701588df56d 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -14,6 +14,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
u32 spl_boot_device(void)
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index f40fccd8f8b..5c66da3eb10 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -27,6 +27,7 @@
#include <asm/arch/timer.h>
#include <asm/arch/tzpc.h>
#include <asm/arch/mmc.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index 532730fe727..cfb6e899209 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/bug.h>
#include <asm/io.h>
#include <asm/arch/gp_padctrl.h>
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 66376dd39a2..513153cbbb6 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -37,6 +37,7 @@
#ifdef CONFIG_TEGRA_CLOCK_SCALING
#include <asm/arch/emc.h>
#endif
+#include <asm/u-boot.h>
#include "emc.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index b89f7badb52..33b40f8f7c8 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -15,6 +15,7 @@
#include <stdlib.h>
#include <string.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c
index 602b20e6b7e..237f184b751 100644
--- a/arch/arm/mach-tegra/dt-setup.c
+++ b/arch/arm/mach-tegra/dt-setup.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/arch-tegra/gpu.h>
+#include <asm/u-boot.h>
/*
* This function is called right before the kernel is booted. "blob" is the
diff --git a/arch/arm/mach-uniphier/bcu/bcu-ld4.c b/arch/arm/mach-uniphier/bcu/bcu-ld4.c
index ea6088ba1cb..33c1f12ce9a 100644
--- a/arch/arm/mach-uniphier/bcu/bcu-ld4.c
+++ b/arch/arm/mach-uniphier/bcu/bcu-ld4.c
@@ -5,6 +5,7 @@
* Author: Masahiro Yamada <yamada.masahiro at socionext.com>
*/
+#include <asm/u-boot.h>
#include <linux/io.h>
#include "../init.h"
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 30e4e23a643..b112b4c8cad 100644
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -5,6 +5,7 @@
* Author: Masahiro Yamada <yamada.masahiro at socionext.com>
*/
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c
index f24a0eb0b82..fcdd2fddab3 100644
--- a/arch/arm/mach-uniphier/clk/dpll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c
@@ -4,6 +4,7 @@
* Copyright (C) 2015-2016 Socionext Inc.
*/
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c
index 204aee1a62c..b5ba17af136 100644
--- a/arch/arm/mach-uniphier/clk/dpll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c
@@ -4,6 +4,7 @@
* Copyright (C) 2015-2016 Socionext Inc.
*/
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 1eb15b611fd..2a3002d1891 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -5,6 +5,7 @@
* Author: Masahiro Yamada <yamada.masahiro at socionext.com>
*/
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index 0114df782b4..535545866c8 100644
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -5,6 +5,7 @@
* Author: Masahiro Yamada <yamada.masahiro at socionext.com>
*/
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
index 73574201e31..199e846dc9d 100644
--- a/arch/arm/mach-uniphier/dram/umc-pxs2.c
+++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c
@@ -7,6 +7,7 @@
* Copyright (C) 2015 Socionext Inc.
*/
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index 583a1bad8b7..99039617479 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -5,6 +5,7 @@
* Author: Masahiro Yamada <yamada.masahiro at socionext.com>
*/
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/fdt-fixup.c b/arch/arm/mach-uniphier/fdt-fixup.c
index dfa32fdd48b..f65a8b62e66 100644
--- a/arch/arm/mach-uniphier/fdt-fixup.c
+++ b/arch/arm/mach-uniphier/fdt-fixup.c
@@ -6,6 +6,7 @@
#include <fdt_support.h>
#include <fdtdec.h>
+#include <asm/u-boot.h>
#include <jffs2/load_kernel.h>
#include <mtd_node.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index ab0d187a1fa..7a79340a92c 100644
--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@@ -5,6 +5,7 @@
* Author: Masahiro Yamada <yamada.masahiro at socionext.com>
*/
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/printk.h>
diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c
index 249e050cc8d..497b6d06aa1 100644
--- a/arch/arm/mach-versal/clk.c
+++ b/arch/arm/mach-versal/clk.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index a35aac2c02c..c8a8415d5eb 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -13,6 +13,7 @@
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 9bab393e211..0d652db49ec 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <asm/arch/clk.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index 77b7cb13071..cdd4a5b8c7a 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -13,6 +13,7 @@
#include <asm/arch/hardware.h>
#include <asm/arch/ps7_init_gpl.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#define ZYNQ_SILICON_VER_MASK 0xF0000000
#define ZYNQ_SILICON_VER_SHIFT 28
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index eceb6e114c0..311c3dfe443 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <generated/dt.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
index b9574997859..a16c2216a29 100644
--- a/arch/arm/mach-zynqmp-r5/cpu.c
+++ b/arch/arm/mach-zynqmp-r5/cpu.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <asm/armv7_mpu.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
index 1e6e726e879..83dfd4f1bd8 100644
--- a/arch/arm/mach-zynqmp/clk.c
+++ b/arch/arm/mach-zynqmp/clk.c
@@ -11,6 +11,7 @@
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index a03b29acb83..443f6afbee1 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -15,6 +15,7 @@
#include <asm/io.h>
#include <zynqmp_firmware.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#define ZYNQ_SILICON_VER_MASK 0xF000
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index 9dd61e25f6f..14253a1c675 100644
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <log.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu_init.c b/arch/m68k/cpu/mcf5227x/cpu_init.c
index 4ab13b4d8ea..182656b62f0 100644
--- a/arch/m68k/cpu/mcf5227x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5227x/cpu_init.c
@@ -12,6 +12,7 @@
#include <cpu_func.h>
#include <init.h>
#include <watchdog.h>
+#include <asm/u-boot.h>
#include <asm/immap.h>
#include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 8d3ab6f3fb2..c091d39ef67 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -16,6 +16,7 @@
#include <command.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/immap.h>
#include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c
index 87effa71dc3..8d3619b3166 100644
--- a/arch/m68k/cpu/mcf523x/cpu_init.c
+++ b/arch/m68k/cpu/mcf523x/cpu_init.c
@@ -14,6 +14,7 @@
#include <watchdog.h>
#include <asm/immap.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_CMD_NET)
#include <config.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 0676e391410..9a6a77e13c0 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -23,6 +23,7 @@
#include <asm/immap.h>
#include <asm/io.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "cpu.h"
diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c
index 9d4a10f028d..b564e75dbd0 100644
--- a/arch/m68k/cpu/mcf52x2/cpu_init.c
+++ b/arch/m68k/cpu/mcf52x2/cpu_init.c
@@ -23,6 +23,7 @@
#include <watchdog.h>
#include <asm/immap.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_CMD_NET)
#include <config.h>
diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c
index 83529408eb3..b7dfb0d90ee 100644
--- a/arch/m68k/cpu/mcf530x/cpu_init.c
+++ b/arch/m68k/cpu/mcf530x/cpu_init.c
@@ -10,6 +10,7 @@
#include <watchdog.h>
#include <asm/immap.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_M5307)
/*
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index d37dd3defb7..cc56cdebb25 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -16,6 +16,7 @@
#include <command.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
index 1311f3967c9..f7d371e37a1 100644
--- a/arch/m68k/cpu/mcf532x/cpu_init.c
+++ b/arch/m68k/cpu/mcf532x/cpu_init.c
@@ -14,6 +14,7 @@
#include <watchdog.h>
#include <asm/immap.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_MCFFEC)
#include <config.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index ac1e5916816..1bdf983ac2e 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -16,6 +16,7 @@
#include <command.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
index 9deab51d07e..7610e03fa5f 100644
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@@ -16,6 +16,7 @@
#include <asm/processor.h>
#include <asm/rtc.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#if defined(CONFIG_CMD_NET)
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index c1361e70579..4df8459f698 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -16,6 +16,7 @@
#include <command.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/immap.h>
#include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
index 8e42b631412..20443e81835 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu_init.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
@@ -14,6 +14,7 @@
#include <init.h>
#include <asm/immap.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_CMD_NET)
#include <config.h>
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index c88e4fea407..da4ad9049bd 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 51a6f938586..6dbb86ee396 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -12,6 +12,7 @@
#include <lmb.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <u-boot/zlib.h>
#include <bzlib.h>
#include <watchdog.h>
diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index c49141f376d..78bbe6f56ba 100644
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -13,6 +13,7 @@
#include <command.h>
#include <asm/processor.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
extern void _exc_handler(void);
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 05ab0e1b157..64ac5bc2851 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -13,6 +13,7 @@
#include <asm/global_data.h>
#include <asm/microblaze_timer.h>
#include <asm/microblaze_intc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 16e0d0ef0a9..444f5eabba9 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -8,6 +8,7 @@
/* References to section boundaries */
+#include <asm/u-boot.h>
extern char __end[];
extern char __text_start[];
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 6695ac63c77..cdf8124d901 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -19,6 +19,7 @@
#include <log.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c
index d5a139ef5ec..53e8cccad47 100644
--- a/arch/mips/lib/boot.c
+++ b/arch/mips/lib/boot.c
@@ -7,6 +7,7 @@
#include <command.h>
#include <cpu_func.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index ec165a32b0a..c0004176c4c 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -14,6 +14,7 @@
#include <asm/addrspace.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index 510ef4c6c09..190a3cc495e 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -20,6 +20,7 @@
#include <asm/mipsregs.h>
#include <asm/addrspace.h>
#include <asm/system.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-ath79/ar933x/clk.c b/arch/mips/mach-ath79/ar933x/clk.c
index 68d48939d7d..6b3cbdd0e57 100644
--- a/arch/mips/mach-ath79/ar933x/clk.c
+++ b/arch/mips/mach-ath79/ar933x/clk.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/addrspace.h>
#include <asm/types.h>
+#include <asm/u-boot.h>
#include <mach/ar71xx_regs.h>
#include <mach/ath79.h>
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index 6ed4057353a..9e4dd8bb7e5 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -11,6 +11,7 @@
#include <asm/io.h>
#include <asm/addrspace.h>
#include <asm/types.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <mach/ar71xx_regs.h>
diff --git a/arch/mips/mach-ath79/qca953x/clk.c b/arch/mips/mach-ath79/qca953x/clk.c
index f5438ef1c8d..6e8a4c0d194 100644
--- a/arch/mips/mach-ath79/qca953x/clk.c
+++ b/arch/mips/mach-ath79/qca953x/clk.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/addrspace.h>
#include <asm/types.h>
+#include <asm/u-boot.h>
#include <mach/ar71xx_regs.h>
#include <mach/ath79.h>
diff --git a/arch/mips/mach-ath79/qca956x/clk.c b/arch/mips/mach-ath79/qca956x/clk.c
index 6a58dba91f3..996f846c480 100644
--- a/arch/mips/mach-ath79/qca956x/clk.c
+++ b/arch/mips/mach-ath79/qca956x/clk.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/addrspace.h>
#include <asm/types.h>
+#include <asm/u-boot.h>
#include <mach/ar71xx_regs.h>
#include <mach/ath79.h>
#include <wait_bit.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index de9bd05fcfd..5eeaaf7a146 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -15,6 +15,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/sections.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <mach/jz4780.h>
#include <mach/jz4780_dram.h>
diff --git a/arch/mips/mach-octeon/dram.c b/arch/mips/mach-octeon/dram.c
index ff7a59f2ab8..331394b34a6 100644
--- a/arch/mips/mach-octeon/dram.c
+++ b/arch/mips/mach-octeon/dram.c
@@ -6,6 +6,7 @@
#include <dm.h>
#include <ram.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compat.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c
index c3efa31f594..733a513ed58 100644
--- a/arch/nds32/cpu/n1213/ae3xx/cpu.c
+++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c
@@ -19,6 +19,7 @@
#include <irq_func.h>
#include <watchdog.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <faraday/ftwdt010_wdt.h>
diff --git a/arch/nds32/cpu/n1213/ag101/cpu.c b/arch/nds32/cpu/n1213/ag101/cpu.c
index 9d99c83bf3a..8fd331779cb 100644
--- a/arch/nds32/cpu/n1213/ag101/cpu.c
+++ b/arch/nds32/cpu/n1213/ag101/cpu.c
@@ -19,6 +19,7 @@
#include <irq_func.h>
#include <watchdog.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <faraday/ftwdt010_wdt.h>
diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c
index 394fc10ec3a..7fef69cd213 100644
--- a/arch/nds32/cpu/n1213/ag101/timer.c
+++ b/arch/nds32/cpu/n1213/ag101/timer.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <time.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <faraday/fttmr010.h>
#include <linux/delay.h>
@@ -193,4 +194,5 @@ ulong get_tbclk(void)
return CONFIG_SYS_CLK_FREQ;
#endif
}
+
#endif /* CONFIG_TIMER */
diff --git a/arch/nds32/lib/boot.c b/arch/nds32/lib/boot.c
index da2fd36a16c..9411285fe23 100644
--- a/arch/nds32/lib/boot.c
+++ b/arch/nds32/lib/boot.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <command.h>
+#include <asm/u-boot.h>
unsigned long do_go_exec(ulong (*entry)(int, char * const []),
int argc, char *const argv[])
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 4668ed9af8b..95759930454 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -13,6 +13,7 @@
#include <image.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
diff --git a/arch/nds32/lib/interrupts.c b/arch/nds32/lib/interrupts.c
index 1481e055007..3d04e3091f8 100644
--- a/arch/nds32/lib/interrupts.c
+++ b/arch/nds32/lib/interrupts.c
@@ -14,6 +14,7 @@
#include <irq_func.h>
#include <asm/ptrace.h>
#include <asm/system.h>
+#include <asm/u-boot.h>
#undef INTERRUPT_MODE
static int int_flag;
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 8d531898bd8..927cdc515d9 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -20,6 +20,7 @@
#include <mpc83xx.h>
#include <asm/global_data.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <tsec.h>
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 903983ded3e..4760c188307 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -10,6 +10,7 @@
#include <irq_func.h>
#include <mpc83xx.h>
#include <command.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD)
diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index 707838ac9ab..f658f98d5d6 100644
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <clock_legacy.h>
#include <asm/global_data.h>
+#include <asm/u-boot.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 f9486678af3..2f463f87f7c 100644
--- a/arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
@@ -13,6 +13,7 @@
#include <asm/global_data.h>
#include <asm/processor.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c
index 5e02f4094bb..33ed4895d3b 100644
--- a/arch/powerpc/cpu/mpc83xx/law.c
+++ b/arch/powerpc/cpu/mpc83xx/law.c
@@ -7,6 +7,7 @@
#include <log.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
#include <linux/log2.h>
int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 5c289d00226..7f5ddb99840 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -11,6 +11,7 @@
#include <pci.h>
#include <asm/bitops.h>
#include <asm/global_data.h>
+#include <asm/u-boot.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 84797c871c9..f05f0a9b127 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -12,6 +12,7 @@
#include <mpc83xx.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index a861e8dd2dd..2d194745ed1 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -25,6 +25,7 @@
#include <spd_sdram.h>
#include <asm/bitops.h>
#include <asm/global_data.h>
+#include <asm/u-boot.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 58e197f1208..0ec27a5ac1c 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -602,4 +602,5 @@ U_BOOT_CMD(clocks, 1, 0, do_clocks,
" clocks"
);
+#include <asm/u-boot.h>
#endif
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index 00cb2bd044e..efd5ddf8798 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -9,6 +9,7 @@
#include <mpc83xx.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.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 74781126e94..a0539f4924d 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -18,6 +18,7 @@
#include <kgdb.h>
#include <asm/processor.h>
#include <asm/mpc8349_pci.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index ff73596ba90..53bc1ccca19 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <command.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <fsl_errata.h>
#include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index d35c9780172..ea3554af781 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -31,6 +31,7 @@
#include <asm/processor.h>
#include <fsl_ddr_sdram.h>
#include <asm/ppc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index ad6e79396e7..c4ebab036d3 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -33,6 +33,7 @@
#endif
#include <fsl_usb.h>
#include <hwconfig.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index c6f89e0eba9..d458d0e135e 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -30,6 +30,7 @@
#include <command.h>
#include <config.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 4eecbe667ec..41bbddf81d4 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index 29a64b309b2..6cf2cde8f7f 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <fsl_errata.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index f5126e2c8ac..98b501c6126 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -14,6 +14,7 @@
#include <asm/immap_85xx.h>
#include <asm/io.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
#include <asm/fsl_law.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c
index 4ad762683fb..cfb2c7bf0ad 100644
--- a/arch/powerpc/cpu/mpc85xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc85xx/interrupts.c
@@ -22,6 +22,7 @@
#include <post.h>
#endif
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
void interrupt_init_cpu(unsigned *decrementer_count)
{
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index a85c8117920..397167b3e85 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index c9854a82a96..c9f307d259e 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -16,6 +16,7 @@
#include <asm/mmu.h>
#include <asm/fsl_law.h>
#include <fsl_ddr_sdram.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "mp.h"
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index 111692f15d1..cfae81fbced 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
/* PORDEVSR register */
#define GUTS_PORDEVSR_OFFS 0xc
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
index f3b5450ad55..6aa55b9d842 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 8
#define SRDS2_MAX_LANES 4
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index 2a5c3e32002..94b584e03b5 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 8
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index 81b66c3fa6a..d2d93a9e5f7 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 8
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
index eb54b8252b2..474be34b77d 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 4
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
index 1b4e6149184..231e12bdfea 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 8
diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
index 8cba4222c4f..4fafd03b945 100644
--- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 4
#define SRDS2_MAX_LANES 2
diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 6b8e447e94a..32f3927f444 100644
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
typedef struct serdes_85xx {
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index 719cb4f3d4e..8dd9660bd4d 100644
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 4
#define SRDS2_MAX_LANES 2
diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
index bf5cac61992..516f61b452e 100644
--- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 4
diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
index f36b1b64ede..4e79a7fcfa1 100644
--- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#define SRDS1_MAX_LANES 4
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
index 3eca3a69326..47e30a15e2e 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
@@ -7,6 +7,7 @@
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include "fsl_corenet_serdes.h"
static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
index ec8234c1c1e..be417c94112 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
@@ -7,6 +7,7 @@
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include "fsl_corenet_serdes.h"
static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
index 463fa119c9b..fdbb3f7a172 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
@@ -8,6 +8,7 @@
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include "fsl_corenet_serdes.h"
static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
index ec8234c1c1e..be417c94112 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
@@ -7,6 +7,7 @@
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include "fsl_corenet_serdes.h"
static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
index 2327b2c2a41..a8403d21bbe 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
@@ -7,6 +7,7 @@
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include "fsl_corenet_serdes.h"
/*
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index 9a6fc13b73f..8853a6ea489 100644
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <asm/bitops.h>
#include <asm/cpm_85xx.h>
+#include <asm/u-boot.h>
#include <pci.h>
#if !defined(CONFIG_FSL_PCI_INIT) && !defined(CONFIG_DM_PCI)
diff --git a/arch/powerpc/cpu/mpc85xx/qe_io.c b/arch/powerpc/cpu/mpc85xx/qe_io.c
index c5b1443058e..fb75fa105ba 100644
--- a/arch/powerpc/cpu/mpc85xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc85xx/qe_io.c
@@ -10,6 +10,7 @@
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/immap_85xx.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_QE) && !defined(CONFIG_U_QE)
#define NUM_OF_PINS 32
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 09653c70125..c83727ed05a 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -13,6 +13,7 @@
#include <cpu_func.h>
#include <ppc_asm.tmpl>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/processor.h>
#include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/spl_minimal.c b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
index 21b35db08df..723f6ecef62 100644
--- a/arch/powerpc/cpu/mpc85xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
@@ -8,6 +8,7 @@
#include <asm/global_data.h>
#include <fsl_ifc.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
index 16458e73be1..d803fc6c2b2 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
@@ -7,7 +7,7 @@
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
#include <asm/io.h>
-
+#include <asm/u-boot.h>
static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
[0x40] = {PCIE1, PCIE1, PCIE1, PCIE1},
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
index 3a7fdef79c2..4b77ab66bc9 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
@@ -7,6 +7,7 @@
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
index 32cfcc0242b..f6fc13c48e1 100644
--- a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
#include "fsl_corenet2_serdes.h"
struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
index a8c0c47f4af..6ee09d78413 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
@@ -7,6 +7,7 @@
#include <asm/fsl_serdes.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include "fsl_corenet2_serdes.h"
struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 927df4e5b66..2993a528630 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -12,6 +12,7 @@
#include <asm/global_data.h>
#include <asm/processor.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_ADDR_MAP
#include <addr_map.h>
#endif
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 080451ec567..0f37ed283f6 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -27,6 +27,7 @@
#include <irq_func.h>
#include <kgdb.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 05160778566..bab81cc72ab 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -19,6 +19,7 @@
#include <mpc86xx.h>
#include <asm/fsl_law.h>
#include <asm/ppc.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c
index 73779f862c2..4e18aebcfa5 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
@@ -19,6 +19,7 @@
#include <asm/fsl_law.h>
#include <asm/fsl_serdes.h>
#include <asm/mp.h>
+#include <asm/u-boot.h>
extern void srio_init(void);
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index 24e53115ecc..a5c313b8a25 100644
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/mp.h>
diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index 5a916600ed6..d3ebda7d408 100644
--- a/arch/powerpc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
@@ -25,6 +25,7 @@
#include <post.h>
#endif
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
void interrupt_init_cpu(unsigned *decrementer_count)
{
diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 86c1709c4ca..770a9449197 100644
--- a/arch/powerpc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
@@ -14,6 +14,7 @@
#include <asm/global_data.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index 0d258b3a97f..91f68fa57cd 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -20,6 +20,7 @@
#include <init.h>
#include <kgdb.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index f79a06d19a2..06931f96f32 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -29,6 +29,7 @@
#include <asm/cache.h>
#include <asm/cpm_8xx.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index c8d06b0508d..fdba3d2c42c 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <init.h>
#include <watchdog.h>
+#include <asm/u-boot.h>
#include <mpc8xx.h>
#include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c
index 75aef758f06..7c01af4ccde 100644
--- a/arch/powerpc/cpu/mpc8xx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xx/fdt.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.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 40793c26e12..c95182444b5 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <command.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/immap_8xx.h>
#include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index eef1951f2fd..799edced8f0 100644
--- a/arch/powerpc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
@@ -13,6 +13,7 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
/************************************************************************/
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 56794b08a15..33ecc0e00b9 100644
--- a/arch/powerpc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -19,6 +19,7 @@
#include <asm/ptrace.h>
#include <command.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
/* Returns 0 if exception not found and fixup otherwise. */
extern unsigned long search_exception_table(unsigned long);
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 560488be22e..4c9da029304 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -20,6 +20,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <vsc9953.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 67f8b100018..ea4375f2cfd 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <cpu_func.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/mp.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index 29489b46e6c..406965df28e 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -7,6 +7,7 @@
#include <hang.h>
#include <init.h>
#include <asm/fsl_lbc.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_MPC83xx
#include "../mpc83xx/elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index bc5958511d7..393729448a6 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -11,6 +11,7 @@
#include <linux/log2.h>
#include <malloc.h>
#include <asm/fsl_pamu.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
struct paace *ppaact;
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index ff4b878aa9c..bc1f34d781e 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -10,6 +10,7 @@
#include <display_options.h>
#include <asm/bitops.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/fsl_law.h>
#include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index c73cf9319c8..aa9b2d9e2ad 100644
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -10,6 +10,7 @@
#include <asm/fsl_law.h>
#include <asm/fsl_serdes.h>
#include <asm/fsl_srio.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/arch/powerpc/include/asm/fsl_liodn.h b/arch/powerpc/include/asm/fsl_liodn.h
index 7ced50c1d42..2f1c6c297c4 100644
--- a/arch/powerpc/include/asm/fsl_liodn.h
+++ b/arch/powerpc/include/asm/fsl_liodn.h
@@ -7,6 +7,7 @@
#define _FSL_LIODN_H_
#include <asm/types.h>
+#include <asm/u-boot.h>
#include <fsl_qbman.h>
struct srio_liodn_id_table {
diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index 055364c58fd..661e7b5989a 100644
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -38,6 +38,7 @@
#endif
#include <asm/processor.h>
+#include <asm/u-boot.h>
static inline uint get_immr(void)
{
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 231790ff854..2d9bd267d52 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index cf3e3fd8409..a43126e3974 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -19,6 +19,7 @@
#include <image.h>
#include <malloc.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <u-boot/zlib.h>
#include <bzlib.h>
#include <asm/byteorder.h>
diff --git a/arch/powerpc/lib/extable.c b/arch/powerpc/lib/extable.c
index 7e9d4f22f39..20ee6205854 100644
--- a/arch/powerpc/lib/extable.c
+++ b/arch/powerpc/lib/extable.c
@@ -7,6 +7,7 @@
*/
#include <common.h>
#include <log.h>
+#include <asm/u-boot.h>
/*
* The exception table consists of pairs of addresses: the first is the
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 14f32cbd937..c232a1412c8 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -11,6 +11,7 @@
#include <irq_func.h>
#include <time.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
#include <watchdog.h>
#ifdef CONFIG_LED_STATUS
#include <status_led.h>
@@ -43,13 +44,13 @@ static __inline__ void set_dec (unsigned long val)
void enable_interrupts(void)
{
- set_msr (get_msr () | MSR_EE);
+ set_msr(get_msr() | MSR_EE);
}
/* returns flag if MSR_EE was set before */
int disable_interrupts(void)
{
- ulong msr = get_msr ();
+ ulong msr = get_msr();
set_msr (msr & ~MSR_EE);
return ((msr & MSR_EE) != 0);
@@ -63,7 +64,7 @@ int interrupt_init(void)
set_dec (decrementer_count);
- set_msr (get_msr () | MSR_EE);
+ set_msr(get_msr() | MSR_EE);
return (0);
}
diff --git a/arch/powerpc/lib/kgdb.c b/arch/powerpc/lib/kgdb.c
index 8727d18884c..145c5004e0e 100644
--- a/arch/powerpc/lib/kgdb.c
+++ b/arch/powerpc/lib/kgdb.c
@@ -4,6 +4,7 @@
#include <asm/ptrace.h>
#include <asm/signal.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
#define PC_REGNUM 64
#define SP_REGNUM 1
diff --git a/arch/riscv/cpu/ax25/cpu.c b/arch/riscv/cpu/ax25/cpu.c
index f092600e14d..9fdb4078a35 100644
--- a/arch/riscv/cpu/ax25/cpu.c
+++ b/arch/riscv/cpu/ax25/cpu.c
@@ -9,6 +9,7 @@
#include <cpu_func.h>
#include <irq_func.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
/*
* cleanup_before_linux() is called just before we call linux
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index 53fc9455f75..56a76170977 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <asm/encoding.h>
+#include <asm/u-boot.h>
#include <dm/uclass-internal.h>
#include <linux/bitops.h>
#include <linux/string.h>
diff --git a/arch/riscv/cpu/fu540/cpu.c b/arch/riscv/cpu/fu540/cpu.c
index f13c18942f3..70e00851e9d 100644
--- a/arch/riscv/cpu/fu540/cpu.c
+++ b/arch/riscv/cpu/fu540/cpu.c
@@ -5,6 +5,7 @@
#include <irq_func.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
/*
* cleanup_before_linux() is called just before we call linux
diff --git a/arch/riscv/cpu/fu540/dram.c b/arch/riscv/cpu/fu540/dram.c
index cec130ec8dc..26118ea4c82 100644
--- a/arch/riscv/cpu/fu540/dram.c
+++ b/arch/riscv/cpu/fu540/dram.c
@@ -7,6 +7,7 @@
#include <fdtdec.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c
index d78e1a3453a..c38e53b477e 100644
--- a/arch/riscv/cpu/generic/cpu.c
+++ b/arch/riscv/cpu/generic/cpu.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <irq_func.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
/*
* cleanup_before_linux() is called just before we call linux
diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c
index cec130ec8dc..26118ea4c82 100644
--- a/arch/riscv/cpu/generic/dram.c
+++ b/arch/riscv/cpu/generic/dram.c
@@ -7,6 +7,7 @@
#include <fdtdec.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c
index 778d011f7ce..83c96799e91 100644
--- a/arch/riscv/lib/boot.c
+++ b/arch/riscv/lib/boot.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <command.h>
+#include <asm/u-boot.h>
unsigned long do_go_exec(ulong (*entry)(int, char * const []),
int argc, char *const argv[])
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 8dd18205403..19ccd1b43ca 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -14,6 +14,7 @@
#include <hang.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/root.h>
#include <image.h>
#include <asm/byteorder.h>
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index d0a33474497..3a93ac47eb0 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <mapmem.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index edd48e2c1b7..110134c6d42 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -10,6 +10,7 @@
#include <errno.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <os.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 9845d3e8fcb..153015f956b 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -16,6 +16,7 @@
#include <asm/malloc.h>
#include <asm/sections.h>
#include <asm/state.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c
index 2038141947a..b0d7d42adf5 100644
--- a/arch/sandbox/lib/pci_io.c
+++ b/arch/sandbox/lib/pci_io.c
@@ -13,6 +13,7 @@
#include <dm.h>
#include <log.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,
struct udevice **devp, void **ptrp)
diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c
index 801102fc7d5..d4cdfb61ab5 100644
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -11,6 +11,7 @@
#include <net.h>
#include <netdev.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
int checkcpu(void)
{
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index a52bc288617..a9009d375fc 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -33,6 +33,7 @@
#include <asm/arch/systemagent.h>
#include <asm/arch/uart.h>
#include <asm/fsp2/fsp_api.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <power/acpi_pmc.h>
diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c
index 08dbd5538f7..e8ed6ea447b 100644
--- a/arch/x86/cpu/baytrail/early_uart.c
+++ b/arch/x86/cpu/baytrail/early_uart.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <errno.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#define PCI_DEV_CONFIG(segbus, dev, fn) ( \
(((segbus) & 0xfff) << 20) | \
diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index f73738ce5c0..d0e2bcc10fd 100644
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -11,6 +11,7 @@
#include <asm/mrccache.h>
#include <asm/post.h>
#include <asm/arch/iomap.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
/* GPIO SUS */
diff --git a/arch/x86/cpu/braswell/braswell.c b/arch/x86/cpu/braswell/braswell.c
index 3345049993d..c487b9b4347 100644
--- a/arch/x86/cpu/braswell/braswell.c
+++ b/arch/x86/cpu/braswell/braswell.c
@@ -7,6 +7,7 @@
#include <init.h>
#include <asm/mrccache.h>
#include <asm/post.h>
+#include <asm/u-boot.h>
int arch_cpu_init(void)
{
diff --git a/arch/x86/cpu/braswell/early_uart.c b/arch/x86/cpu/braswell/early_uart.c
index d78c6b0feb6..f6f3e9d8a80 100644
--- a/arch/x86/cpu/braswell/early_uart.c
+++ b/arch/x86/cpu/braswell/early_uart.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#define PCI_DEV_CONFIG(segbus, dev, fn) ( \
(((segbus) & 0xfff) << 20) | \
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index 3832a97f2c7..c5ef51c43f2 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -23,6 +23,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/pch.h>
#include <asm/arch/rcb.h>
+#include <asm/u-boot.h>
int arch_cpu_init_dm(void)
{
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 4debddce8ad..9d9abe39847 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -21,6 +21,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/pch.h>
#include <asm/arch/rcb.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
struct cpu_broadwell_priv {
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index ee045a34833..ec929bfb5f5 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <log.h>
#include <asm/arch/pei_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#define RMODULE_MAGIC 0xf8fe
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index 874b2034b9f..0aa2300f1c7 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -24,6 +24,7 @@
#include <asm/arch/pch.h>
#include <asm/arch/pei_data.h>
#include <asm/arch/pm.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
ulong board_get_usable_ram_top(ulong total_size)
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 15c3ad879a0..16c1a5e5bfa 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -16,6 +16,7 @@
#include <asm/mtrr.h>
#include <asm/arch/sysinfo.h>
#include <asm/arch/timestamp.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index a2e47d196a2..b3fddca7098 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -10,6 +10,7 @@
#include <asm/e820.h>
#include <asm/arch/sysinfo.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index 01625978095..86e1f9693ee 100644
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -9,6 +9,7 @@
#include <bootstage.h>
#include <asm/arch/timestamp.h>
#include <asm/arch/sysinfo.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
struct timestamp_entry {
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 078607a435c..4e67391b333 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -47,6 +47,7 @@
#include <asm/processor-flags.h>
#include <asm/interrupt.h>
#include <asm/tables.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c
index f754489784a..91fbad19504 100644
--- a/arch/x86/cpu/efi/app.c
+++ b/arch/x86/cpu/efi/app.c
@@ -8,6 +8,7 @@
#include <fdtdec.h>
#include <init.h>
#include <netdev.h>
+#include <asm/u-boot.h>
int arch_cpu_init(void)
{
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index d9955bb4714..a97409f3db1 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -15,6 +15,7 @@
#include <asm/e820.h>
#include <asm/global_data.h>
#include <asm/post.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c
index af65982fd0c..2b164f72de9 100644
--- a/arch/x86/cpu/efi/sdram.c
+++ b/arch/x86/cpu/efi/sdram.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <asm/global_data.h>
#include <asm/u-boot-x86.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index f0a01c2295f..fec8f2c60b2 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -32,6 +32,7 @@
#include <asm/msr.h>
#include <asm/mtrr.h>
#include <asm/processor-flags.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index 67a72146de8..3ecf907e72e 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -25,6 +25,7 @@
#include <asm/lapic.h>
#include <asm/processor-flags.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/intel_common/cpu_from_spl.c b/arch/x86/cpu/intel_common/cpu_from_spl.c
index 1c0dcedb582..9af8ac90195 100644
--- a/arch/x86/cpu/intel_common/cpu_from_spl.c
+++ b/arch/x86/cpu/intel_common/cpu_from_spl.c
@@ -17,6 +17,7 @@
#include <asm/mtrr.h>
#include <asm/post.h>
#include <asm/microcode.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index eb27f8f1883..a5c62de0919 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -18,6 +18,7 @@
#include <asm/post.h>
#include <asm/arch/me.h>
#include <asm/report_platform.h>
+#include <asm/u-boot.h>
static const char *const ecc_decoder[] = {
"inactive",
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index bddba3eddec..7f5c9e1d201 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -34,6 +34,7 @@
#include <asm/arch/model_206ax.h>
#include <asm/arch/pch.h>
#include <asm/arch/sandybridge.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/ivybridge/ivybridge.c b/arch/x86/cpu/ivybridge/ivybridge.c
index eb3f362e4e9..5677833b1c9 100644
--- a/arch/x86/cpu/ivybridge/ivybridge.c
+++ b/arch/x86/cpu/ivybridge/ivybridge.c
@@ -7,6 +7,7 @@
#include <init.h>
#include <asm/post.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
int arch_cpu_init(void)
{
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index a86ecd7ac40..8e1f615f389 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -36,6 +36,7 @@
#include <asm/arch/pch.h>
#include <asm/post.h>
#include <asm/arch/sandybridge.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c
index 51dfe23f94d..7522e3672f0 100644
--- a/arch/x86/cpu/ivybridge/sdram_nop.c
+++ b/arch/x86/cpu/ivybridge/sdram_nop.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c
index c1745501294..aeb40f767e5 100644
--- a/arch/x86/cpu/qemu/dram.c
+++ b/arch/x86/cpu/qemu/dram.c
@@ -8,6 +8,7 @@
#include <asm/global_data.h>
#include <asm/post.h>
#include <asm/arch/qemu.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
index 044a429c13f..8fab346f801 100644
--- a/arch/x86/cpu/qemu/qemu.c
+++ b/arch/x86/cpu/qemu/qemu.c
@@ -13,6 +13,7 @@
#include <asm/processor.h>
#include <asm/arch/device.h>
#include <asm/arch/qemu.h>
+#include <asm/u-boot.h>
static bool i440fx;
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index d38c3d0809a..e7ccecfe271 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -18,6 +18,7 @@
#include <asm/arch/mrc.h>
#include <asm/arch/msg_port.h>
#include <asm/arch/quark.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c
index 3e8c0bc28c5..d3b237e87e4 100644
--- a/arch/x86/cpu/quark/mrc.c
+++ b/arch/x86/cpu/quark/mrc.c
@@ -36,6 +36,7 @@
#include <version.h>
#include <asm/arch/mrc.h>
#include <asm/arch/msg_port.h>
+#include <asm/u-boot.h>
#include "mrc_util.h"
#include "smc.h"
diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c
index b0bc59b71ef..28176fdd006 100644
--- a/arch/x86/cpu/quark/mrc_util.c
+++ b/arch/x86/cpu/quark/mrc_util.c
@@ -13,6 +13,7 @@
#include <asm/arch/mrc.h>
#include <asm/arch/msg_port.h>
#include <asm/arch/quark.h>
+#include <asm/u-boot.h>
#include "mrc_util.h"
#include "hte.h"
#include "smc.h"
diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
index 30b4711b9a5..44529b6c2ec 100644
--- a/arch/x86/cpu/quark/quark.c
+++ b/arch/x86/cpu/quark/quark.c
@@ -18,6 +18,7 @@
#include <asm/arch/device.h>
#include <asm/arch/msg_port.h>
#include <asm/arch/quark.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
static void quark_setup_mtrr(void)
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index fa47e587a23..af158bab345 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -12,6 +12,7 @@
#include <asm/arch/device.h>
#include <asm/arch/mrc.h>
#include <asm/arch/msg_port.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "mrc_util.h"
#include "hte.h"
diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
index 782ed863fe7..5601422d496 100644
--- a/arch/x86/cpu/queensbay/tnc.c
+++ b/arch/x86/cpu/queensbay/tnc.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <dm.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <dm/device-internal.h>
#include <pci.h>
#include <asm/io.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index 36d0d4da553..bcae2d42519 100644
--- a/arch/x86/cpu/slimbootloader/sdram.c
+++ b/arch/x86/cpu/slimbootloader/sdram.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/e820.h>
#include <asm/arch/slimbootloader.h>
diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c
index ec5b87cfd63..c568651cf79 100644
--- a/arch/x86/cpu/slimbootloader/slimbootloader.c
+++ b/arch/x86/cpu/slimbootloader/slimbootloader.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <asm/arch/slimbootloader.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index e1531385fb8..920dfaf5e26 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -9,6 +9,7 @@
#include <asm/e820.h>
#include <asm/global_data.h>
#include <asm/sfi.h>
+#include <asm/u-boot.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c
index 1e2f6cc8b70..5747c97aea2 100644
--- a/arch/x86/cpu/tangier/tangier.c
+++ b/arch/x86/cpu/tangier/tangier.c
@@ -7,6 +7,7 @@
#include <cpu_func.h>
#include <init.h>
#include <asm/u-boot-x86.h>
+#include <asm/u-boot.h>
/*
* Miscellaneous platform dependent initializations
diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c
index 740851f24f3..c1047b4dc63 100644
--- a/arch/x86/cpu/x86_64/cpu.c
+++ b/arch/x86/cpu/x86_64/cpu.c
@@ -9,6 +9,7 @@
#include <debug_uart.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
/*
* Global declaration of gd.
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index b255144318c..e8d252abcd6 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -13,6 +13,7 @@
#include <hang.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/device.h>
#include <dm/root.h>
#include <errno.h>
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index 82f7d3ab5f0..821d9200d8b 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -19,6 +19,7 @@
#include <asm/post.h>
#include <asm/processor.h>
#include <asm/fsp/fsp_support.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index 32680033736..dfa08867ecd 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -13,6 +13,7 @@
#include <asm/mrccache.h>
#include <asm/mtrr.h>
#include <asm/post.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
index cfd9b9f48c3..74181a78b69 100644
--- a/arch/x86/lib/fsp1/fsp_dram.c
+++ b/arch/x86/lib/fsp1/fsp_dram.c
@@ -7,6 +7,7 @@
#include <init.h>
#include <asm/fsp/fsp_support.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
int dram_init(void)
{
diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index 25aa71c6c20..3bc46b24ab4 100644
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <asm/fsp1/fsp_support.h>
#include <asm/post.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
struct fsp_header *__attribute__((optimize("O0"))) fsp_find_header(void)
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index c31e2a11b7a..b882f9466a8 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -15,6 +15,7 @@
#include <asm/fsp2/fsp_api.h>
#include <asm/fsp2/fsp_internal.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
int dram_init(void)
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index abbe1a011dd..cef17666c35 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -18,6 +18,7 @@
#include <asm/fsp2/fsp_internal.h>
#include <asm/arch/fsp/fsp_configs.h>
#include <asm/arch/fsp/fsp_m_upd.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
static int prepare_mrc_cache_type(enum mrc_type_t type,
diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c
index 0f975389103..33db3dab2e9 100644
--- a/arch/x86/lib/i8254.c
+++ b/arch/x86/lib/i8254.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/i8254.h>
+#include <asm/u-boot.h>
#define TIMER1_VALUE 18 /* 15.6us */
#define BEEP_FREQUENCY_HZ 440
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 066dc404a2d..cf2b7651e8d 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/mtrr.h>
diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c
index a81e4291105..adcaabbd78f 100644
--- a/arch/x86/lib/interrupts.c
+++ b/arch/x86/lib/interrupts.c
@@ -33,6 +33,7 @@
#include <command.h>
#include <irq_func.h>
#include <asm/interrupt.h>
+#include <asm/u-boot.h>
#if !CONFIG_IS_ENABLED(X86_64)
diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c
index 03385396325..2e5ead02060 100644
--- a/arch/x86/lib/ramtest.c
+++ b/arch/x86/lib/ramtest.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/post.h>
+#include <asm/u-boot.h>
static void write_phys(unsigned long addr, u32 value)
{
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 96885c6cc55..63c29673fef 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -24,6 +24,7 @@
#include <asm/processor.h>
#include <asm/spl.h>
#include <asm-generic/sections.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 789472bc9a2..23e32402db3 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -16,6 +16,7 @@
#include <asm/mtrr.h>
#include <asm/processor.h>
#include <asm-generic/sections.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
index 85d3464607d..c7d39b35b37 100644
--- a/arch/xtensa/cpu/cpu.c
+++ b/arch/xtensa/cpu/cpu.c
@@ -12,6 +12,7 @@
#include <command.h>
#include <init.h>
#include <vsprintf.h>
+#include <asm/u-boot.h>
#include <linux/stringify.h>
#include <asm/global_data.h>
#include <asm/cache.h>
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index c33bcf2f9ed..61ae0851756 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -10,6 +10,7 @@
#include <cpu_func.h>
#include <env.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index 3c4a27d63f6..1c142b80a5a 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -14,6 +14,7 @@
#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
#include <netdev.h>
#endif
+#include <asm/u-boot.h>
#include <linux/io.h>
#include <faraday/ftsmc020.h>
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 8848b7f9738..97f25fa42ed 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -13,6 +13,7 @@
#include <netdev.h>
#endif
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/io.h>
#include <asm/io.h>
#include <asm/mach-types.h>
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index d781038de28..bb0dfb5e95d 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -13,6 +13,7 @@
#include <netdev.h>
#endif
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/io.h>
#include <faraday/ftsmc020.h>
#include <fdtdec.h>
diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c
index 712023faf7d..2fedc10d3f2 100644
--- a/board/Arcturus/ucp1020/ddr.c
+++ b/board/Arcturus/ucp1020/ddr.c
@@ -16,6 +16,7 @@
#include <fsl_ddr_dimm_params.h>
#include <asm/io.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#ifdef CONFIG_SYS_DDR_RAW_TIMING
diff --git a/board/Arcturus/ucp1020/law.c b/board/Arcturus/ucp1020/law.c
index cb53692a32b..0dfb8ebc849 100644
--- a/board/Arcturus/ucp1020/law.c
+++ b/board/Arcturus/ucp1020/law.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
#ifdef CONFIG_VSC7385_ENET
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index b5db24da294..1f9206aa614 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -21,6 +21,7 @@
#include <fsl_esdhc.h>
#include <spi_flash.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Arcturus/ucp1020/tlb.c b/board/Arcturus/ucp1020/tlb.c
index 2c07df63e5b..fc8bcea302b 100644
--- a/board/Arcturus/ucp1020/tlb.c
+++ b/board/Arcturus/ucp1020/tlb.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 0846bb0e9ef..838b7995693 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -18,6 +18,7 @@
#include <pci.h>
#include <i2c.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <fsl_mdio.h>
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 7df37e4e66a..9b69baa5dae 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -28,6 +28,7 @@
#include <asm/emif.h>
#include <asm/gpio.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include <power/tps65217.h>
#include "../common/bur_common.h"
#include <watchdog.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index e6eb403fc3d..97605945d1c 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -24,6 +24,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#define USBHUB_RSTN IMX_GPIO_NR(1, 16)
#define BKLT_EN IMX_GPIO_NR(1, 15)
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index 738a5d2ff94..c31f40086ad 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -23,6 +23,7 @@
#include <asm/io.h>
#include <asm/gpio.h>
#include <asm/emif.h>
+#include <asm/u-boot.h>
#include <power/tps65217.h>
#include "../common/bur_common.h"
#include "../common/br_resetc.h"
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index ef692b006d5..6ad7bbec490 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -26,6 +26,7 @@
#include <asm/emif.h>
#include <asm/gpio.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <power/tps65217.h>
#include "../common/bur_common.h"
#include "../common/br_resetc.h"
diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/bur_common.h
index c64ebe93b0e..4db630668e2 100644
--- a/board/BuR/common/bur_common.h
+++ b/board/BuR/common/bur_common.h
@@ -26,4 +26,5 @@ int board_eth_init(struct bd_info *bis);
int brdefaultip_setup(int bus, int chip);
+#include <asm/u-boot.h>
#endif
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index c42711d9733..377d3f41fe6 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -16,6 +16,7 @@
#include <i2c.h>
#include <lcd.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "bur_common.h"
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 486680a49e8..f7f5c117431 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -15,6 +15,7 @@
#include <env.h>
#include <fdt_support.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <linux/string.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index b84227a56e0..995c01d48cd 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -19,6 +19,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <fdt_support.h>
#include <time.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index 12c5ac331f9..a5beea9e550 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -12,6 +12,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/arch/imx-regs.h>
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index 9c066a283c9..1e13f506b5a 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -12,6 +12,7 @@
#include <net.h>
#include <asm/arch/orion5x.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "../common/common.h"
#include <spl.h>
#include <ns16550.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 695d6f6ed47..01d159e19f4 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -20,6 +20,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
#include "net2big_v2.h"
#include "../common/common.h"
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 730eab7e703..3246e5d0dc0 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -19,6 +19,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
#include "netspace_v2.h"
#include "../common/common.h"
diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
index 1f9389c0a7a..78ba8f4b61c 100644
--- a/board/Marvell/aspenite/aspenite.c
+++ b/board/Marvell/aspenite/aspenite.c
@@ -14,6 +14,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/mfp.h>
#include <asm/arch/armada100.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
index 08f79d4b532..43cbe2416d6 100644
--- a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
+++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
@@ -4,6 +4,7 @@
#include <init.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/io.h>
#include <miiphy.h>
diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c
index 26c30647fbb..8f2b0f55b0e 100644
--- a/board/Marvell/db-88f6720/db-88f6720.c
+++ b/board/Marvell/db-88f6720/db-88f6720.c
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 163a1b3de9d..948988c788d 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -13,6 +13,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 06307e582ce..508f007d52e 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -13,6 +13,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 9e1fdecfca4..66c308bda54 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
index 0abdca1cd21..8b2bb4f97a5 100644
--- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
+++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/mbus.h>
#include <linux/io.h>
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index e1c64b52246..ca07a742eab 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -16,6 +16,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "dreamplug.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index c6376cdf6a9..f8d1b9cc13a 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -22,6 +22,7 @@
#include <asm/gpio.h>
#include <miiphy.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#ifdef CONFIG_ARMADA100_FEC
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index 8e7dbb3f3f6..2d5118a176e 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -14,6 +14,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
#include "guruplug.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 73e2c3723a3..3470f3ac478 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index fa27a352142..055e639e3c5 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -11,6 +11,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index f44ac3315eb..55641922657 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -19,6 +19,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
#include "openrd.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 0cc7f2b3924..afa23620a31 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -14,6 +14,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
#include "sheevaplug.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 380e37be550..45776cf9117 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -19,6 +19,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
#include "dockstar.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index 4c19fa7195e..8a287ab364b 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -22,6 +22,7 @@
#include <asm/arch/mpp.h>
#include <asm/arch/cpu.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index cd2bbdad1cd..aac3224a946 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -18,6 +18,7 @@
#include <asm/arch/mpp.h>
#include <asm/arch/cpu.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index 7159535ec45..edadf0441ce 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -14,6 +14,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "ds109.h"
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index 9c4ce670ddf..669b53ad5ed 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -11,6 +11,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/mbus.h>
diff --git a/board/abilis/tb100/tb100.c b/board/abilis/tb100/tb100.c
index 52dc5b8d867..9ef7ed6e7f4 100644
--- a/board/abilis/tb100/tb100.c
+++ b/board/abilis/tb100/tb100.c
@@ -8,6 +8,7 @@
#include <net.h>
#include <netdev.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
void reset_cpu(ulong addr)
{
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 07a47e9fbb0..685fd20f423 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -12,6 +12,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index 8492e7603b4..69626bc40f6 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -10,6 +10,7 @@
#include <errno.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <asm/io.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 5a9a0090535..67028b79a1b 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -10,6 +10,7 @@
#include <spl.h>
#include <fsl_esdhc.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <asm/io.h>
diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
index 8499fc541fa..c2eda4ff44b 100644
--- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
+++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <init.h>
#include <asm/fsp1/fsp_support.h>
+#include <asm/u-boot.h>
/* ALC262 Verb Table - 10EC0262 */
static const u32 verb_table_data13[] = {
diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
index d8b9fdfe356..b8ed9f513c6 100644
--- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
+++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/io.h>
diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
index 52b8eba92fc..3a91decbb76 100644
--- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
+++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
@@ -11,6 +11,7 @@
#include <netdev.h>
#include <led.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/io.h>
#include <asm/arch/cpu.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index d602092d732..aa4e8915882 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -12,6 +12,7 @@
#include <wdt.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/mbus.h>
#include <linux/io.h>
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 94e39613440..a1b179d1a3c 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -10,6 +10,7 @@
#include <env.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <linux/usb/musb.h>
#include <asm/omap_musb.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index ab73a928d66..4b7694a7e88 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -17,6 +17,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 5e3fdd36fa2..8f205624496 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -10,6 +10,7 @@
#include <hang.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <jffs2/jffs2.h>
#include <nand.h>
#include <netdev.h>
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index a730f15c7a3..ddad2bd80da 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -26,6 +26,7 @@
#include <netdev.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_pl01x.h>
#include "arm-ebi.h"
#include "integrator-sc.h"
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index d359a36c774..d4835191a93 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -29,6 +29,7 @@
#include <asm/arch/systimer.h>
#include <asm/arch/sysctrl.h>
#include <asm/arch/wdt.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../drivers/mmc/arm_pl180_mmci.h"
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index cc118a02f11..c88482d3cef 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -14,6 +14,7 @@
#include <netdev.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <dm/platform_data/serial_pl01x.h>
#include <linux/string.h>
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index 1bae2832522..9520be30529 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -31,6 +31,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
#include <asm/arch/rmobile.h>
+#include <asm/u-boot.h>
#define s_init_wait(cnt) \
({ \
diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c
index a314ced5e4a..5838e36c7a4 100644
--- a/board/atmel/at91rm9200ek/at91rm9200ek.c
+++ b/board/atmel/at91rm9200ek/at91rm9200ek.c
@@ -19,6 +19,7 @@
#include <asm/arch/at91_pio.h>
#include <asm/arch/at91_common.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 38f97bce204..56687ccf13b 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -16,6 +16,7 @@
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 0318eeaa94e..3a36a23a4d3 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -25,6 +25,7 @@
#include <netdev.h>
#endif
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 3218e14e860..5960c1862ce 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -12,6 +12,7 @@
#include <net.h>
#include <vsprintf.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/arch/at91sam9263.h>
#include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 8cb2808e058..7f728125c06 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -19,6 +19,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/clk.h>
#include <lcd.h>
+#include <asm/u-boot.h>
#include <linux/mtd/rawnand.h>
#include <atmel_lcdc.h>
#include <asm/mach-types.h>
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index a3fc55bbc34..75d5ffa88ae 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -20,6 +20,7 @@
#include <lcd.h>
#include <atmel_hlcdc.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_LCD_INFO
#include <nand.h>
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index f427ee658bf..6f3debe3f37 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -19,6 +19,7 @@
#include <asm/arch/at91_rstc.h>
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
#include <lcd.h>
#include <atmel_lcdc.h>
diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
index e0abe4aeb08..12dad5557a7 100644
--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
@@ -15,6 +15,7 @@
#include <asm/arch/gpio.h>
#include <debug_uart.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index 33725a01f50..b3f876c6e58 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -16,6 +16,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/clk.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/sam9x60ek/sam9x60ek.c b/board/atmel/sam9x60ek/sam9x60ek.c
index 32e5a2bf23a..4788d174caf 100644
--- a/board/atmel/sam9x60ek/sam9x60ek.c
+++ b/board/atmel/sam9x60ek/sam9x60ek.c
@@ -17,6 +17,7 @@
#include <asm/arch/gpio.h>
#include <debug_uart.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
extern void at91_pda_detect(void);
diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
index 1b7d946b50c..0f8ce6d29c0 100644
--- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
+++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
@@ -16,6 +16,7 @@
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
#include <asm/arch/sama5d2.h>
+#include <asm/u-boot.h>
extern void at91_pda_detect(void);
diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
index 32d51bba7d9..b8d02c4639b 100644
--- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
+++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
@@ -17,6 +17,7 @@
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
#include <asm/arch/sama5d2.h>
+#include <asm/u-boot.h>
extern void at91_pda_detect(void);
diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c
index 3f33fcfc466..889a09fd855 100644
--- a/board/atmel/sama5d2_icp/sama5d2_icp.c
+++ b/board/atmel/sama5d2_icp/sama5d2_icp.c
@@ -16,6 +16,7 @@
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
#include <asm/arch/sama5d2.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
index a6937e7d524..96abf9ef3d4 100644
--- a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
+++ b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
@@ -21,6 +21,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/sama5d2.h>
#include <asm/arch/sama5d2_smc.h>
+#include <asm/u-boot.h>
extern void at91_pda_detect(void);
diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
index 5110ec89697..4dbd9d63e2c 100644
--- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
+++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
@@ -16,6 +16,7 @@
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
#include <asm/arch/sama5d2.h>
+#include <asm/u-boot.h>
extern void at91_pda_detect(void);
diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
index db9603f5847..8956abfced4 100644
--- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c
+++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
@@ -17,6 +17,7 @@
#include <spl.h>
#include <asm/arch/atmel_mpddrc.h>
#include <asm/arch/at91_wdt.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index 4fe979bc8a5..9e1caafb952 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -15,6 +15,7 @@
#include <asm/arch/clk.h>
#include <debug_uart.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <spl.h>
#include <asm/arch/atmel_mpddrc.h>
diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
index 2088b48b7ee..f021276c6df 100644
--- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c
+++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
@@ -16,6 +16,7 @@
#include <asm/arch/sama5d3_smc.h>
#include <asm/arch/sama5d4.h>
#include <debug_uart.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c
index 46ec1eb3246..8f4a91cbaed 100644
--- a/board/atmel/sama5d4ek/sama5d4ek.c
+++ b/board/atmel/sama5d4ek/sama5d4ek.c
@@ -16,6 +16,7 @@
#include <asm/arch/sama5d3_smc.h>
#include <asm/arch/sama5d4.h>
#include <debug_uart.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 69d1b106b07..0754a599433 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -28,6 +28,7 @@
#include <pca953x.h>
#include <asm/gpio.h>
#include <phy.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bachmann/ot1200/ot1200_spl.c b/board/bachmann/ot1200/ot1200_spl.c
index 7fbd6f2c5d3..297d5a72b0e 100644
--- a/board/bachmann/ot1200/ot1200_spl.c
+++ b/board/bachmann/ot1200/ot1200_spl.c
@@ -7,6 +7,7 @@
#include <init.h>
#include <spl.h>
#include <asm/arch/mx6-ddr.h>
+#include <asm/u-boot.h>
/* Configure MX6Q/DUAL mmdc DDR io registers */
static struct mx6dq_iomux_ddr_regs ot1200_ddr_ioregs = {
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index ec8d5528887..af2b37cbdb1 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -22,6 +22,7 @@
#include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/boot_mode.h>
+#include <asm/u-boot.h>
#include "platinum.h"
diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c
index aa33d1feb32..a023ddca33c 100644
--- a/board/barco/platinum/spl_picon.c
+++ b/board/barco/platinum/spl_picon.c
@@ -18,6 +18,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "platinum.h"
diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c
index ef1e2c419b4..0395d197448 100644
--- a/board/barco/platinum/spl_titanium.c
+++ b/board/barco/platinum/spl_titanium.c
@@ -18,6 +18,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "platinum.h"
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index efd1dc35ef4..fe27965b482 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -23,6 +23,7 @@
#include <micrel.h>
#include <miiphy.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index c343de51023..17b99df5e81 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -7,6 +7,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/rcar-mstp.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/beacon/imx8mm/imx8mm_beacon.c b/board/beacon/imx8mm/imx8mm_beacon.c
index 87ffebb5713..f4ac47e7f31 100644
--- a/board/beacon/imx8mm/imx8mm_beacon.c
+++ b/board/beacon/imx8mm/imx8mm_beacon.c
@@ -7,6 +7,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 572dc519123..ed9843ac269 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -14,6 +14,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/mach-imx/boot_mode.h>
#include <asm/arch/ddr.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <dm/uclass.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index e451ef9ef36..3fbfcb525af 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -17,6 +17,7 @@
#include <asm/mach-imx/mx5_video.h>
#include <ACEX1K.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index ed0885f724c..0bb752e51bd 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -25,6 +25,7 @@
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/mii.h>
#include <miiphy.h>
#include <netdev.h>
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index 2ac23674f9c..706bb6935d2 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -33,6 +33,7 @@
#include <asm/arch/atmel_serial.h>
#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
#include <dm/uclass-internal.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c
index 87fb967ea05..188001c77ed 100644
--- a/board/bluewater/snapper9260/snapper9260.c
+++ b/board/bluewater/snapper9260/snapper9260.c
@@ -24,6 +24,7 @@
#include <netdev.h>
#include <i2c.h>
#include <pca953x.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 113838f8b72..a397190d434 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -20,6 +20,7 @@
#include <miiphy.h>
#include <panel.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <power/tps65217.h>
#include <power/tps65910.h>
#include <spl.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index bfce291691a..3b453623826 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -36,6 +36,7 @@
#include <i2c.h>
#include <miiphy.h>
#include <cpsw.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <power/tps65217.h>
#include <env_internal.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 3cc093ed530..16b50dac92a 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -17,6 +17,7 @@
#include <asm/arch/sys_proto.h>
#include <malloc.h>
#include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
index 90685c072a3..0a5ae5718be 100644
--- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
+++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
@@ -14,6 +14,7 @@
#include <asm/kona-common/kona_sdhci.h>
#include <asm/kona-common/clk.h>
#include <asm/arch/sysmap.h>
+#include <asm/u-boot.h>
#include <usb.h>
#include <usb/dwc2_udc.h>
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 43726f79bde..4c097308947 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -14,6 +14,7 @@
#include <asm/kona-common/kona_sdhci.h>
#include <asm/kona-common/clk.h>
#include <asm/arch/sysmap.h>
+#include <asm/u-boot.h>
#include <usb.h>
#include <usb/dwc2_udc.h>
diff --git a/board/broadcom/bcm963158/bcm963158.c b/board/broadcom/bcm963158/bcm963158.c
index 9feaee3c0fc..b2244ad5578 100644
--- a/board/broadcom/bcm963158/bcm963158.c
+++ b/board/broadcom/bcm963158/bcm963158.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <fdtdec.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/io.h>
#ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm968360bg/bcm968360bg.c b/board/broadcom/bcm968360bg/bcm968360bg.c
index 90af6b88bd4..4ed21504be6 100644
--- a/board/broadcom/bcm968360bg/bcm968360bg.c
+++ b/board/broadcom/bcm968360bg/bcm968360bg.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <fdtdec.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/io.h>
#ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm968580xref/bcm968580xref.c b/board/broadcom/bcm968580xref/bcm968580xref.c
index 1bd723d49ed..78ef68db1bf 100644
--- a/board/broadcom/bcm968580xref/bcm968580xref.c
+++ b/board/broadcom/bcm968580xref/bcm968580xref.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <fdtdec.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/io.h>
#ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index 6064eb43db1..d14bb9e9e01 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -14,6 +14,7 @@
#include <netdev.h>
#include <asm/system.h>
#include <asm/iproc-common/armpll.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c
index 494e457ff65..4ced6609086 100644
--- a/board/broadcom/bcmns2/northstar2.c
+++ b/board/broadcom/bcmns2/northstar2.c
@@ -9,6 +9,7 @@
#include <asm/global_data.h>
#include <asm/system.h>
#include <asm/armv8/mmu.h>
+#include <asm/u-boot.h>
static struct mm_region ns2_mem_map[] = {
{
diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c
index f6bdf1f5f40..4e942f5f71c 100644
--- a/board/broadcom/bcmstb/bcmstb.c
+++ b/board/broadcom/bcmstb/bcmstb.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/types.h>
#include <common.h>
#include <env.h>
diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
index c9da42b43bf..875eebd96f5 100644
--- a/board/bticino/mamoj/mamoj.c
+++ b/board/bticino/mamoj/mamoj.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index 883b7f4133b..f033b6d19ec 100644
--- a/board/bticino/mamoj/spl.c
+++ b/board/bticino/mamoj/spl.c
@@ -10,6 +10,7 @@
#include <serial.h>
#include <spl.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <asm/io.h>
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 34be601fdde..9eff76527fe 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -25,6 +25,7 @@
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "lsxl.h"
diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index 2869e5cf688..0ff90c4f483 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -8,6 +8,7 @@
#include <command.h>
#include <dm.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/net_ethoc.h>
#include <env.h>
#include <linux/ctype.h>
diff --git a/board/calao/usb_a9263/usb_a9263.c b/board/calao/usb_a9263/usb_a9263.c
index c0a5c518ca8..0f59a9276c7 100644
--- a/board/calao/usb_a9263/usb_a9263.c
+++ b/board/calao/usb_a9263/usb_a9263.c
@@ -19,6 +19,7 @@
#include <asm/io.h>
#include <net.h>
#include <netdev.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index ccb6b26c91b..18b0f43aa7d 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -11,6 +11,7 @@
#include <errno.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <cavium/atf.h>
diff --git a/board/ccv/xpress/spl.c b/board/ccv/xpress/spl.c
index 38bda8d1847..357945eea1a 100644
--- a/board/ccv/xpress/spl.c
+++ b/board/ccv/xpress/spl.c
@@ -11,6 +11,7 @@
#include <asm/io.h>
#include <asm/arch/mx6-ddr.h>
#include <asm/arch/crm_regs.h>
+#include <asm/u-boot.h>
/* Configuration for IM IME1G16D3EEBG-15EI, 64M x 16 -> 128MiB */
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 9f5e78ce680..8e23359751a 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -26,6 +26,7 @@
#include <mmc.h>
#include <netdev.h>
#include <usb.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <usb/ehci-ci.h>
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index 7a7f62fe88e..f2fb24000c8 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -25,6 +25,7 @@
#include <asm/io.h>
#include <asm/mach-types.h>
#include <asm/arch/ep93xx.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index 039fd6e3dd6..66543f2f1b5 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -18,6 +18,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "pogo_e02.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 454c93a572f..46a0fa76473 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -16,6 +16,7 @@
#include <netdev.h>
#include <fsl_esdhc_imx.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <power/pmic.h>
#include <power/pfuze3000_pmic.h>
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index 0128b912801..18dc86cdc83 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -16,6 +16,7 @@
#include <asm/arch-mx7/mx7-pins.h>
#include <asm/arch-mx7/clock.h>
#include <asm/arch-mx7/mx7-ddr.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "common.h"
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 46da479a45f..4147c4f7d02 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -33,6 +33,7 @@
#include <asm/mach-imx/video.h>
#include <asm/io.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_mxc.h>
#include <dm/device-internal.h>
#include <jffs2/load_kernel.h>
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index c3c816181fd..ab739330d9c 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -20,6 +20,7 @@
#include <asm/arch/crm_regs.h>
#include <asm/mach-imx/iomux-v3.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "common.h"
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index 1d4a3aceef5..2a63aadf0d7 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -15,6 +15,7 @@
#include <status_led.h>
#include <cpsw.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index efdade155b5..92c8092d6d7 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -12,6 +12,7 @@
#include <asm/gpio.h>
#include <asm/arch/sys_proto.h>
#include <asm/emif.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <power/pmic.h>
#include <power/tps65218.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 3f74cd87890..62c53d782e0 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -28,6 +28,7 @@
#include <fsl_esdhc_imx.h>
#include <i2c.h>
#include <input.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <power/pmic.h>
diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
index 315b6dc5429..df2170ba109 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
+++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
@@ -10,6 +10,7 @@
#include <asm/gpio.h>
#include <asm/ibmpc.h>
#include <asm/pnp_def.h>
+#include <asm/u-boot.h>
int board_early_init_f(void)
{
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index a6fc7f67d02..53495aa187b 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -21,6 +21,7 @@
#include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/mem.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "tricorder.h"
#include "tricorder-eeprom.h"
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index 5c735222637..1c46293ffd5 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -10,6 +10,7 @@
#include <netdev.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/compiler.h>
#include <configs/presidio_asic.h>
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index 2aa2435e49c..cbaa5e59eac 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -20,6 +20,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index 2603ad4c57d..b9015254234 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -16,6 +16,7 @@
#include <serial.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <wdt.h>
#include <linux/delay.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index 055783f63ad..9c8f8775ac5 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -20,6 +20,7 @@
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "dns325.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 7b3f303f3a7..38e51eb23e3 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -23,6 +23,7 @@
#include <asm/arch/pinmux_defs.h>
#include <asm/io.h>
#include <asm/arch/davinci_misc.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <hwconfig.h>
#include <asm/mach-types.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 3f4bd39ec8f..347f616df67 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -18,6 +18,7 @@
#include <asm/ti-common/davinci_nand.h>
#include <asm/io.h>
#include <ns16550.h>
+#include <asm/u-boot.h>
#include <dm/platdata.h>
#include <linux/errno.h>
#include <asm/mach-types.h>
diff --git a/board/dfi/dfi-bt700/dfi-bt700.c b/board/dfi/dfi-bt700/dfi-bt700.c
index 87506a77a17..0b294595d4c 100644
--- a/board/dfi/dfi-bt700/dfi-bt700.c
+++ b/board/dfi/dfi-bt700/dfi-bt700.c
@@ -10,6 +10,7 @@
#include <asm/gpio.h>
#include <asm/ibmpc.h>
#include <asm/pnp_def.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
int board_early_init_f(void)
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index c8c99a2aa47..8428cc6183b 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/device-internal.h>
#include <asm/arch/clock.h>
#include <asm/arch/crm_regs.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index dd8f1625be3..bcb39eab886 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -25,6 +25,7 @@
#include <i2c.h>
#include <mmc.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 851024f52b3..61c86a2d443 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -16,6 +16,7 @@
#include <clk.h>
#include <config.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <dm/device.h>
#include <dm/uclass.h>
#include <env.h>
diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c
index 5b2d444366c..0aa2be80e00 100644
--- a/board/ea/mx7ulp_com/mx7ulp_com.c
+++ b/board/ea/mx7ulp_com/mx7ulp_com.c
@@ -11,6 +11,7 @@
#include <asm/arch/mx7ulp-pins.h>
#include <asm/arch/iomux.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index f806d1e7672..a7e529c2151 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -19,6 +19,7 @@
#include <watchdog.h>
#include <debug_uart.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/ofnode.h>
#include <power/pmic.h>
#include <power/regulator.h>
diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index 559fdd2f646..6dc58eab14e 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -61,6 +61,7 @@
#include <mmc.h>
#include <atmel_mci.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/arch/at91sam9260.h>
#include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index 382a255d162..f5c874dcda8 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -14,6 +14,7 @@
#include <asm/arch/mx6-pins.h>
#include <env.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c
index e0057ce1e6e..c26abf9ce10 100644
--- a/board/elgin/elgin_rv1108/elgin_rv1108.c
+++ b/board/elgin/elgin_rv1108/elgin_rv1108.c
@@ -13,6 +13,7 @@
#include <asm/arch-rockchip/grf_rv1108.h>
#include <asm/arch-rockchip/hardware.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 65b3942e399..3cd24de612b 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -21,6 +21,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
index f18f2ed7da3..2d9cb0a9a42 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <virtio_types.h>
#include <virtio.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_ARM64
#include <asm/armv8/mmu.h>
diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index dcfd3f20bee..575367e1de7 100644
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -13,6 +13,7 @@
#include <init.h>
#include <virtio_types.h>
#include <virtio.h>
+#include <asm/u-boot.h>
int board_init(void)
{
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 28080d423b3..e301f3e98bc 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -17,6 +17,7 @@
#include <asm/arch/sys_proto.h>
#include <watchdog.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "board.h"
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index d57419a78ef..1e3dbbe111e 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <serial.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 81aa22bc831..fe2f9a4d2b1 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -28,6 +28,7 @@
#include <asm/arch/at91_pio.h>
#include <asm/arch/clk.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 56dd2269cb8..15b1e07d89f 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -28,6 +28,7 @@
#include <spd_sdram.h>
#include <i2c.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
index be97a28ed25..6b3690610d9 100644
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/freescale/common/cds_pci_ft.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include "cadmus.h"
diff --git a/board/freescale/common/p_corenet/law.c b/board/freescale/common/p_corenet/law.c
index 603384ac4f9..f70ed76386f 100644
--- a/board/freescale/common/p_corenet/law.c
+++ b/board/freescale/common/p_corenet/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c
index 636334863e1..ce6c375aff4 100644
--- a/board/freescale/common/p_corenet/pci.c
+++ b/board/freescale/common/p_corenet/pci.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <pci.h>
#include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/fsl_serdes.h>
diff --git a/board/freescale/common/p_corenet/tlb.c b/board/freescale/common/p_corenet/tlb.c
index c0ab1a5fd14..6f8d8354e87 100644
--- a/board/freescale/common/p_corenet/tlb.c
+++ b/board/freescale/common/p_corenet/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index ed0d9b471ca..2d4d9202994 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -17,6 +17,7 @@
#else
#include <asm/immap_85xx.h>
#endif
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "vid.h"
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 3a83e65f2fe..67b47e33e72 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/freescale/corenet_ds/corenet_ds.h b/board/freescale/corenet_ds/corenet_ds.h
index 84e5c4a2de2..bf9181e0768 100644
--- a/board/freescale/corenet_ds/corenet_ds.h
+++ b/board/freescale/corenet_ds/corenet_ds.h
@@ -6,6 +6,7 @@
#ifndef __CORENET_DS_H__
#define __CORENET_DS_H__
+#include <asm/u-boot.h>
void fdt_fixup_board_enet(void *blob);
void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index a8e499869f5..4fbbe4b00d0 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -14,6 +14,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 90ce999be0c..71c588c1417 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -56,6 +56,7 @@
#include <malloc.h>
#include <fdt_support.h>
#include <fsl_dtsec.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/ngpixis.h"
diff --git a/board/freescale/corenet_ds/eth_p4080.c b/board/freescale/corenet_ds/eth_p4080.c
index 650013bb6fc..3360e0ffc79 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -22,6 +22,7 @@
#include <fsl_mdio.h>
#include <miiphy.h>
#include <phy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "../common/ngpixis.h"
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index 296b2b10027..57fb5a77f06 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -57,6 +57,7 @@
#include <malloc.h>
#include <fdt_support.h>
#include <fsl_dtsec.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/ngpixis.h"
diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c
index ab55135a972..0e505b39bf8 100644
--- a/board/freescale/imx8mm_evk/imx8mm_evk.c
+++ b/board/freescale/imx8mm_evk/imx8mm_evk.c
@@ -9,6 +9,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index fbc13ad128a..1e366fd8fa6 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -19,6 +19,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/mach-imx/boot_mode.h>
#include <asm/arch/ddr.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <dm/uclass.h>
diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c
index 9a0a0488bf4..d12a8f68a91 100644
--- a/board/freescale/imx8mn_evk/imx8mn_evk.c
+++ b/board/freescale/imx8mn_evk/imx8mn_evk.c
@@ -7,6 +7,7 @@
#include <env.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 9f3c5884128..3fda215ba4c 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -20,6 +20,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/mach-imx/boot_mode.h>
#include <asm/arch/ddr.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <dm/uclass.h>
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
index 56da4d4c6a3..4f16a14cd8e 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
@@ -13,6 +13,7 @@
#include <asm/arch/imx8mp_pins.h>
#include <asm/arch/sys_proto.h>
#include <asm/mach-imx/gpio.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index ebfd94dc1fa..8965f623a1f 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -20,6 +20,7 @@
#include <asm/arch/imx8mp_pins.h>
#include <asm/arch/sys_proto.h>
#include <asm/mach-imx/boot_mode.h>
+#include <asm/u-boot.h>
#include <power/pmic.h>
#include <power/pca9450.h>
diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c
index 93da67d7798..18f0b7f3d3b 100644
--- a/board/freescale/imx8mq_evk/imx8mq_evk.c
+++ b/board/freescale/imx8mq_evk/imx8mq_evk.c
@@ -22,6 +22,7 @@
#include <asm/mach-imx/mxc_i2c.h>
#include <asm/arch/clock.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <power/pmic.h>
#include <power/pfuze100_pmic.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 66a0be0b3df..d9d1973120b 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -23,6 +23,7 @@
#include <asm/mach-imx/mxc_i2c.h>
#include <fsl_esdhc_imx.h>
#include <mmc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <power/pmic.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index 7b280be8e94..de9e4f0de41 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -9,6 +9,7 @@
#include <errno.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/io.h>
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index cdbff80e31b..9853c258fe8 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <spl.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <dm/device.h>
#include <dm/uclass-internal.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 645e9923548..b6511d4e9df 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -9,6 +9,7 @@
#include <errno.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fsl_esdhc_imx.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 9eb4268ce3f..ac354d396e5 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -11,6 +11,7 @@
#include <log.h>
#include <spl.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <dm/device.h>
#include <dm/uclass-internal.h>
diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
index 35241acd224..81695fc27d0 100644
--- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c
+++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
@@ -13,6 +13,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/armv7m.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
index b8d852f097b..1b56414c020 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
+++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
@@ -13,6 +13,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/armv7m.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 2cd651b943f..c872318b2c8 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -23,6 +23,7 @@
#include <fsl_mmdc.h>
#include <netdev.h>
#include <fsl_sec.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 5c89385acca..163d2c41948 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -29,6 +29,7 @@
#include <spl.h>
#include <netdev.h>
#include <fsl_sec.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/qixis.h"
#include "ls1012aqds_qixis.h"
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 02f3ff6aa02..1d3461f2423 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -28,6 +28,7 @@
#include <fsl_mmdc.h>
#include <netdev.h>
#include <fsl_sec.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index d257f9723e3..0170712c246 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -13,6 +13,7 @@
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/ls102xa_stream_id.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index e63fe63e40c..8ce2b4e5c01 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -11,6 +11,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "ddr.h"
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index 9cf797477b8..f9aa2f09fb9 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -20,6 +20,7 @@
#include <fsl_mdio.h>
#include <tsec.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/sgmii_riser.h"
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index d3af462e68a..267af86ccb2 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -25,6 +25,7 @@
#include <fsl_devdis.h>
#include <fsl_validate.h>
#include <fsl_ddr.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/sleep.h"
#include "../common/qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 010d243754c..16d9df1b704 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -12,6 +12,7 @@
#include <asm/arch/ls102xa_soc.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "../common/sleep.h"
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 72014b2173a..8640d2746a2 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -29,6 +29,7 @@
#include <fsl_sec.h>
#include <fsl_devdis.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "../common/sleep.h"
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index 984883bb00f..de41dd155e6 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -14,6 +14,7 @@
#include <asm/io.h>
#include <hwconfig.h>
#include <fdt_support.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <env_internal.h>
#include <asm/arch-fsl-layerscape/soc.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index 23947bdb84c..38362d1332a 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "ddr.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index fc4dc210f90..68e1642d2d4 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -13,6 +13,7 @@
#include <fm_eth.h>
#include <fsl_mdio.h>
#include <fsl_dtsec.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <malloc.h>
#include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 44e4c61eab2..8fc20ea46e7 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -28,6 +28,7 @@
#include <fsl_esdhc.h>
#include <fsl_ifc.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include "../common/qixis.h"
#include "ls1043aqds_qixis.h"
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 75346de3726..73156305b62 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -7,6 +7,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "ddr.h"
#include <log.h>
diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index 1f01c155165..dde2f376c9a 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -10,6 +10,7 @@
#include <fsl_dtsec.h>
#include <fsl_mdio.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include "../common/fman.h"
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index beef26b084b..d9ab32bd2cc 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -21,6 +21,7 @@
#include <fsl_esdhc.h>
#include <fsl_ifc.h>
#include <fsl_sec.h>
+#include <asm/u-boot.h>
#include "cpld.h"
#ifdef CONFIG_U_QE
#include <fsl_qe.h>
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 1b27d3e8538..5797c764dce 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -11,6 +11,7 @@
#include <fsl_dtsec.h>
#include <fsl_mdio.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/fman.h"
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 9813a36ca07..4d2d66b6b35 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -22,6 +22,7 @@
#include <fsl_esdhc.h>
#include <fsl_sec.h>
#include <fsl_dspi.h>
+#include <asm/u-boot.h>
#define LS1046A_PORSR1_REG 0x1EE0000
#define BOOT_SRC_SD 0x20000000
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index 9a96de27178..7d13e1d6a8d 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "ddr.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 8f5f95e3968..b4ea0239da4 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -15,6 +15,7 @@
#include <fsl_dtsec.h>
#include <malloc.h>
#include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
#include "../common/qixis.h"
#include "../common/fman.h"
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 3c96c900c32..cb11eb633bb 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -29,6 +29,7 @@
#include <fsl_ifc.h>
#include <fsl_sec.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include "../common/vid.h"
#include "../common/qixis.h"
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index befb556bd30..cb41b6c6707 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -7,6 +7,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "ddr.h"
#ifdef CONFIG_FSL_DEEP_SLEEP
#include <fsl_sleep.h>
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index ddfee621793..c0ae35c6e39 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -11,6 +11,7 @@
#include <fsl_dtsec.h>
#include <fsl_mdio.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/fman.h"
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index 93ef903f299..6a15cdfcd33 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -21,6 +21,7 @@
#include <fm_eth.h>
#include <fsl_csu.h>
#include <fsl_esdhc.h>
+#include <asm/u-boot.h>
#include <power/mc34vr500_pmic.h>
#include "cpld.h"
#include <fsl_sec.h>
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index 995c4296017..9694a6c0e05 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -10,6 +10,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "ddr.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index f1cccf7d73f..de44024173f 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -18,6 +18,7 @@
#include <fm_eth.h>
#include <i2c.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <fsl-mc/fsl_mc.h>
#include <fsl-mc/ldpaa_wriop.h>
#include <linux/delay.h>
diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c
index a8e9ef15dc4..5c5655e549b 100644
--- a/board/freescale/ls1088a/eth_ls1088ardb.c
+++ b/board/freescale/ls1088a/eth_ls1088ardb.c
@@ -15,6 +15,7 @@
#include <asm/io.h>
#include <exports.h>
#include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
#include <fsl-mc/fsl_mc.h>
#include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 8fcd8ef7cdd..921fd985bf6 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -17,6 +17,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <fdt_support.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fsl-mc/fsl_mc.h>
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index a647cc6a3f7..87a721fc500 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -10,6 +10,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "ddr.h"
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index 020e7bfcb5c..d9c87d6840d 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -14,6 +14,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <fdt_support.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fsl-mc/fsl_mc.h>
#include <env_internal.h>
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 2767d058cc9..5b0f64df6c2 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -10,6 +10,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "ddr.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 1b8235c9a09..1a3a891f825 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -16,6 +16,7 @@
#include <fm_eth.h>
#include <i2c.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <fsl-mc/fsl_mc.h>
#include <fsl-mc/ldpaa_wriop.h>
#include <linux/delay.h>
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 87d7e5312f4..ac4388a1188 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -14,6 +14,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <fdt_support.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fsl-mc/fsl_mc.h>
#include <env_internal.h>
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 07fa8473332..2d33f662dce 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -10,6 +10,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/clock.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "ddr.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index 21b4c16ff27..786a253cbd5 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -17,6 +17,7 @@
#include <asm/io.h>
#include <exports.h>
#include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
#include <fsl-mc/fsl_mc.h>
#include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index a6ece49c01e..49304091638 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -16,6 +16,7 @@
#include <asm/io.h>
#include <hwconfig.h>
#include <fdt_support.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fsl-mc/fsl_mc.h>
#include <env_internal.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index b069e4fb266..20dffcbf327 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -21,6 +21,7 @@
#include <asm/io.h>
#include <exports.h>
#include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
#include <fsl-mc/fsl_mc.h>
#include <fsl-mc/ldpaa_wriop.h>
#include <linux/libfdt.h>
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index 02f36f4f5f5..604922f8412 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -18,6 +18,7 @@
#include <asm/io.h>
#include <exports.h>
#include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
#include <fsl-mc/fsl_mc.h>
#include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 8d87b29cfde..2133177cbe1 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -9,6 +9,7 @@
#include <dm.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_pl01x.h>
#include <i2c.h>
#include <malloc.h>
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 2a4703579da..f593c31c842 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -14,6 +14,7 @@
#include <asm/immap.h>
#include <netdev.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
index db9c5ba1935..f5ad1dde606 100644
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ b/board/freescale/mpc8308rdb/mpc8308rdb.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <net.h>
#include <spi.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index f309961dca8..1bd4b381da3 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -21,6 +21,7 @@
#include <asm/gpio.h>
#endif
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index 795162b3c0c..3f9c9b68e21 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 977bd512059..a587796f042 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -20,6 +20,7 @@
#include <miiphy.h>
#include <command.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <linux/string.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index f34758a9470..e012b2714ab 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -24,6 +24,7 @@
#if defined(CONFIG_PQ_MDS_PIB)
#include "../common/pq-mds-pib.h"
#endif
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index ac5ddc6d94b..75175fb0ca9 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <asm/u-boot.h>
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 5f38639afd4..bf113280bec 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -20,6 +20,7 @@
#else
#include <spd_sdram.h>
#endif
+#include <asm/u-boot.h>
#include <linux/delay.h>
#if defined(CONFIG_OF_LIBFDT)
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index 356b0ea2daa..14e08f033a5 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -23,6 +23,7 @@
#if defined(CONFIG_OF_LIBFDT)
#include <linux/libfdt.h>
#endif
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index c4233aad741..699aa4a5bf8 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -15,6 +15,7 @@
#include <asm/fsl_mpc83xx_serdes.h>
#include <spd_sdram.h>
#include <tsec.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c
index 3e5a64d14f0..06cb3a6553b 100644
--- a/board/freescale/mpc837xemds/pci.c
+++ b/board/freescale/mpc837xemds/pci.c
@@ -14,6 +14,7 @@
#include <fdt_support.h>
#include <asm/fsl_i2c.h>
#include <asm/fsl_mpc83xx_serdes.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/freescale/mpc837xemds/pci.h b/board/freescale/mpc837xemds/pci.h
index a5680319888..bf56a3bf2b2 100644
--- a/board/freescale/mpc837xemds/pci.h
+++ b/board/freescale/mpc837xemds/pci.h
@@ -1,6 +1,7 @@
#ifndef __BOARD_MPC837XEMDS_PCI_H
#define __BOARD_MPC837XEMDS_PCI_H
+#include <asm/u-boot.h>
extern void ft_pcie_fixup(void *blob, struct bd_info *bd);
#endif /* __BOARD_MPC837XEMDS_PCI_H */
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 81d31f19c4c..d3cc5274537 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -18,6 +18,7 @@
#include <spd_sdram.h>
#include <vsc7385.h>
#include <fsl_esdhc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8541cds/law.c b/board/freescale/mpc8541cds/law.c
index 69f151b6151..f4b7bde0a81 100644
--- a/board/freescale/mpc8541cds/law.c
+++ b/board/freescale/mpc8541cds/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 3986d81c62d..6f02b8e7b8f 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -16,6 +16,7 @@
#include <fsl_ddr_sdram.h>
#include <ioports.h>
#include <spd_sdram.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8541cds/tlb.c b/board/freescale/mpc8541cds/tlb.c
index d4ed51c5438..ff596f988df 100644
--- a/board/freescale/mpc8541cds/tlb.c
+++ b/board/freescale/mpc8541cds/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8544ds/law.c b/board/freescale/mpc8544ds/law.c
index 52cec7fbb59..8e9c8b4d232 100644
--- a/board/freescale/mpc8544ds/law.c
+++ b/board/freescale/mpc8544ds/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_LBC_NONCACHE_BASE, LAW_SIZE_128M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index 30ed7083657..06dc619cf93 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -16,6 +16,7 @@
#include <asm/fsl_serdes.h>
#include <asm/io.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <fsl_mdio.h>
diff --git a/board/freescale/mpc8544ds/tlb.c b/board/freescale/mpc8544ds/tlb.c
index 7bd462934aa..a07e6834918 100644
--- a/board/freescale/mpc8544ds/tlb.c
+++ b/board/freescale/mpc8544ds/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8548cds/law.c b/board/freescale/mpc8548cds/law.c
index d1943889915..4c8bbed5c39 100644
--- a/board/freescale/mpc8548cds/law.c
+++ b/board/freescale/mpc8548cds/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
/* LBC window - maps 256M */
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index fd51c0e8018..941071594bd 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -18,6 +18,7 @@
#include <fsl_ddr_sdram.h>
#include <asm/fsl_serdes.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8548cds/tlb.c b/board/freescale/mpc8548cds/tlb.c
index 8d1e5fee936..b6869c33078 100644
--- a/board/freescale/mpc8548cds/tlb.c
+++ b/board/freescale/mpc8548cds/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8555cds/law.c b/board/freescale/mpc8555cds/law.c
index 69f151b6151..f4b7bde0a81 100644
--- a/board/freescale/mpc8555cds/law.c
+++ b/board/freescale/mpc8555cds/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index d91763ae800..d66f5699666 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -14,6 +14,7 @@
#include <fsl_ddr_sdram.h>
#include <ioports.h>
#include <spd_sdram.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8555cds/tlb.c b/board/freescale/mpc8555cds/tlb.c
index 4a18f05af0d..b0e0af9b697 100644
--- a/board/freescale/mpc8555cds/tlb.c
+++ b/board/freescale/mpc8555cds/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8568mds/law.c b/board/freescale/mpc8568mds/law.c
index c04c36b5d82..f315288611f 100644
--- a/board/freescale/mpc8568mds/law.c
+++ b/board/freescale/mpc8568mds/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 1acdf93e4d7..810bcff8b6b 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -20,6 +20,7 @@
#include <spd_sdram.h>
#include <i2c.h>
#include <ioports.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8568mds/tlb.c b/board/freescale/mpc8568mds/tlb.c
index fea1606a1d3..98864e7716a 100644
--- a/board/freescale/mpc8568mds/tlb.c
+++ b/board/freescale/mpc8568mds/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8569mds/law.c b/board/freescale/mpc8569mds/law.c
index 35cdd75d6e6..1f0bd1279ef 100644
--- a/board/freescale/mpc8569mds/law.c
+++ b/board/freescale/mpc8569mds/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index b4b75f3642a..7f00ddc82a1 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -23,6 +23,7 @@
#include <spd_sdram.h>
#include <i2c.h>
#include <ioports.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8569mds/tlb.c b/board/freescale/mpc8569mds/tlb.c
index fdbac549847..5bec3a1663b 100644
--- a/board/freescale/mpc8569mds/tlb.c
+++ b/board/freescale/mpc8569mds/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 11ca08d1a0b..886cabf6324 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <asm/u-boot.h>
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8572ds/law.c b/board/freescale/mpc8572ds/law.c
index 10d1572c5de..7f9a2c3785a 100644
--- a/board/freescale/mpc8572ds/law.c
+++ b/board/freescale/mpc8572ds/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index 97e73533ab4..d81a3308359 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -20,6 +20,7 @@
#include <asm/io.h>
#include <asm/fsl_serdes.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8572ds/tlb.c b/board/freescale/mpc8572ds/tlb.c
index 99b136b0429..72f0aa572c1 100644
--- a/board/freescale/mpc8572ds/tlb.c
+++ b/board/freescale/mpc8572ds/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8610hpcd/law.c b/board/freescale/mpc8610hpcd/law.c
index 7bf5e6815d7..7f9a58e7a79 100644
--- a/board/freescale/mpc8610hpcd/law.c
+++ b/board/freescale/mpc8610hpcd/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
#if !defined(CONFIG_SPD_EEPROM)
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 74b0e45b4f8..157f850fef5 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -17,6 +17,7 @@
#include <asm/fsl_serdes.h>
#include <i2c.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 3e45a3390a2..fd182fe8717 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -13,6 +13,7 @@
#include <log.h>
#include <asm/io.h>
#include <fsl_diu_fb.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/pixis.h"
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index df7e3eceed7..f2dccadd3d1 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <asm/u-boot.h>
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8641hpcn/law.c b/board/freescale/mpc8641hpcn/law.c
index b73d6608831..0e00138835e 100644
--- a/board/freescale/mpc8641hpcn/law.c
+++ b/board/freescale/mpc8641hpcn/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index b30b86364d5..c4a7a568cd1 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -15,6 +15,7 @@
#include <fsl_ddr_sdram.h>
#include <asm/fsl_serdes.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
index 605cdec218a..b25bdb38601 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/freescale/mx23evk/mx23evk.c
@@ -19,6 +19,7 @@
#include <asm/arch/clock.h>
#include <asm/arch/iomux-mx23.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 3b445a46dd7..4c2f6da69c2 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -16,6 +16,7 @@
#include <mmc.h>
#include <fsl_esdhc_imx.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <power/pmic.h>
#include <fsl_pmic.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index 21c9cb11283..72abf8739bc 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -21,6 +21,7 @@
#include <asm/arch/iomux-mx28.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <miiphy.h>
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 4039d9f049a..362a0391e4f 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -10,6 +10,7 @@
#include <net.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index ac48e7668c0..f1625ebac5c 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -10,6 +10,7 @@
#include <asm/gpio.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux-mx51.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index f9ec5ca6ef3..89aa16a097b 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -13,6 +13,7 @@
#include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <netdev.h>
#include <mmc.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index b006638e2c1..5567f3f01a9 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -12,6 +12,7 @@
#include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/mach-imx/boot_mode.h>
#include <netdev.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index ee54a61d874..7a1cebbebfd 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -16,6 +16,7 @@
#include <asm/arch/iomux-mx53.h>
#include <asm/arch/clock.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/mach-imx/mx5_video.h>
#include <netdev.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 2f91a0525c4..335146604a5 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -12,6 +12,7 @@
#include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <netdev.h>
#include <mmc.h>
diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c
index 1cc744fa9ba..35dc7fd15f2 100644
--- a/board/freescale/mx6memcal/mx6memcal.c
+++ b/board/freescale/mx6memcal/mx6memcal.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index 87020e3ffb1..63f4f531b86 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -16,6 +16,7 @@
#include <asm/arch/mx6-pins.h>
#include <asm/arch/sys_proto.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index c06fd643677..03cceefb60d 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -11,6 +11,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/mx6-pins.h>
#include <asm/arch/clock.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index f8612c82342..98b3ab4b765 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -16,6 +16,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 15f5b654c1b..40423d77c4b 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -15,6 +15,7 @@
#include <asm/global_data.h>
#include <asm/mach-imx/spi.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/gpio.h>
#include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 24086a124f0..781c5392655 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -19,6 +19,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <common.h>
#include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index b4fddafe640..9ce66e42899 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -16,6 +16,7 @@
#include <asm/mach-imx/boot_mode.h>
#include <asm/io.h>
#include <common.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <mmc.h>
#include <power/pmic.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 7340a344023..f705505b518 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -18,6 +18,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/boot_mode.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <common.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 57fab238641..d8f4e915cfd 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -19,6 +19,7 @@
#include <asm/io.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <common.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index ef2408715cf..6805d949f17 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -23,6 +23,7 @@
#include <fsl_esdhc_imx.h>
#include <i2c.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <mmc.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 86c11c7bd3a..4686981e44c 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -18,6 +18,7 @@
#include <common.h>
#include <env.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <mmc.h>
#include <miiphy.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 2777ae13bce..d3cdfd85894 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -13,6 +13,7 @@
#include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <common.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index 01e32136532..1e4053edbe7 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -12,6 +12,7 @@
#include <asm/arch/mx7ulp-pins.h>
#include <asm/arch/iomux.h>
#include <asm/mach-imx/boot_mode.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 9444a39b6e8..2e2a524b0e2 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -13,6 +13,7 @@
#include <fsl_ddr_dimm_params.h>
#include <asm/io.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1010rdb/law.c b/board/freescale/p1010rdb/law.c
index debf571482b..756f0524da0 100644
--- a/board/freescale/p1010rdb/law.c
+++ b/board/freescale/p1010rdb/law.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 3ffec6a02f1..f209f72fdbe 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -17,6 +17,7 @@
#include <asm/io.h>
#include <env.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <fsl_mdio.h>
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 059ce8e100f..3e35b49f3d2 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -16,6 +16,7 @@
#include <fsl_esdhc.h>
#include <spi_flash.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/spl.h"
diff --git a/board/freescale/p1010rdb/tlb.c b/board/freescale/p1010rdb/tlb.c
index 04faefe994d..5357bc8e7b0 100644
--- a/board/freescale/p1010rdb/tlb.c
+++ b/board/freescale/p1010rdb/tlb.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1023rdb/law.c b/board/freescale/p1023rdb/law.c
index 405fcd7b490..69238db8dde 100644
--- a/board/freescale/p1023rdb/law.c
+++ b/board/freescale/p1023rdb/law.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index bb4a39a3fa6..c760b4c83bd 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -23,6 +23,7 @@
#include <fsl_ddr_sdram.h>
#include <asm/fsl_portals.h>
#include <fsl_qbman.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <netdev.h>
diff --git a/board/freescale/p1023rdb/tlb.c b/board/freescale/p1023rdb/tlb.c
index 9f0314d190f..4c0e668e99b 100644
--- a/board/freescale/p1023rdb/tlb.c
+++ b/board/freescale/p1023rdb/tlb.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c
index 2c7e5fe4c7b..87c78886e14 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/freescale/p1_p2_rdb_pc/ddr.c
@@ -12,6 +12,7 @@
#include <fsl_ddr_dimm_params.h>
#include <asm/io.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#ifdef CONFIG_SYS_DDR_RAW_TIMING
diff --git a/board/freescale/p1_p2_rdb_pc/law.c b/board/freescale/p1_p2_rdb_pc/law.c
index 5f4d713ca56..5aebabcc901 100644
--- a/board/freescale/p1_p2_rdb_pc/law.c
+++ b/board/freescale/p1_p2_rdb_pc/law.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 7c703b354fa..f4ab4492536 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -25,6 +25,7 @@
#include <asm/fsl_lbc.h>
#include <asm/mp.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 46c5d15ad18..9b687bc4c08 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -17,6 +17,7 @@
#include <fsl_esdhc.h>
#include <spi_flash.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/spl.h"
diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c
index 14971f0476e..1254ab4d306 100644
--- a/board/freescale/p1_p2_rdb_pc/tlb.c
+++ b/board/freescale/p1_p2_rdb_pc/tlb.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 910058cefe1..281368bfc8a 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -13,6 +13,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 396981605d2..a4936531120 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -20,6 +20,7 @@
#include <fsl_mdio.h>
#include <malloc.h>
#include <fsl_dtsec.h>
+#include <asm/u-boot.h>
#include "cpld.h"
#include "../common/fman.h"
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 4ece1e6ea0a..2f8e9c12551 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index b38d03c07a3..c99f998fbb3 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -17,6 +17,7 @@
#include <asm/mmu.h>
#include <asm/fsl_pci.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <netdev.h>
diff --git a/board/freescale/s32v234evb/s32v234evb.c b/board/freescale/s32v234evb/s32v234evb.c
index 304f5acf3be..846a89849f0 100644
--- a/board/freescale/s32v234evb/s32v234evb.c
+++ b/board/freescale/s32v234evb/s32v234evb.c
@@ -16,6 +16,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <i2c.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index f4cdbf5b446..f62f5d12405 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -14,6 +14,7 @@
#include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h>
#include <asm/mpc85xx_gpio.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index b64590f9d79..414a45f2c0a 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -24,6 +24,7 @@
#include <phy.h>
#include <fsl_dtsec.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#include "../common/fman.h"
int board_eth_init(struct bd_info *bis)
diff --git a/board/freescale/t102xrdb/law.c b/board/freescale/t102xrdb/law.c
index 04a4239797c..0cb63f80797 100644
--- a/board/freescale/t102xrdb/law.c
+++ b/board/freescale/t102xrdb/law.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
#ifdef CONFIG_MTD_NOR_FLASH
diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c
index 45ab9223ae1..2f1a27b4250 100644
--- a/board/freescale/t102xrdb/pci.c
+++ b/board/freescale/t102xrdb/pci.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <pci.h>
#include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/fsl_serdes.h>
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index d8bfbd82791..6596f2cfafe 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -15,6 +15,7 @@
#include <fsl_esdhc.h>
#include <spi_flash.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/sleep.h"
#include "../common/spl.h"
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index c51555a97e2..5f98f768cc3 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -13,6 +13,7 @@
#include <init.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/freescale/t102xrdb/t102xrdb.h b/board/freescale/t102xrdb/t102xrdb.h
index 33df0f24df8..a567ae18dab 100644
--- a/board/freescale/t102xrdb/t102xrdb.h
+++ b/board/freescale/t102xrdb/t102xrdb.h
@@ -6,6 +6,7 @@
#ifndef __T1024_RDB_H__
#define __T1024_RDB_H__
+#include <asm/u-boot.h>
void fdt_fixup_board_enet(void *blob);
void pci_of_setup(void *blob, struct bd_info *bd);
#ifdef CONFIG_TARGET_T1023RDB
diff --git a/board/freescale/t102xrdb/tlb.c b/board/freescale/t102xrdb/tlb.c
index 97080eb95e5..57f5c50bc98 100644
--- a/board/freescale/t102xrdb/tlb.c
+++ b/board/freescale/t102xrdb/tlb.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 8351f7ce9db..2198acfba61 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -14,6 +14,7 @@
#include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h>
#include <asm/mpc85xx_gpio.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "ddr.h"
diff --git a/board/freescale/t104xrdb/diu.c b/board/freescale/t104xrdb/diu.c
index 25c8597202a..dc46a977317 100644
--- a/board/freescale/t104xrdb/diu.c
+++ b/board/freescale/t104xrdb/diu.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <command.h>
#include <fsl_diu_fb.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <video_fb.h>
diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index 8e2f0358740..a554083470e 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -13,6 +13,7 @@
#include <malloc.h>
#include <fsl_dtsec.h>
#include <vsc9953.h>
+#include <asm/u-boot.h>
#include "../common/fman.h"
diff --git a/board/freescale/t104xrdb/law.c b/board/freescale/t104xrdb/law.c
index 0f6b71a8c22..74f6d8a34e3 100644
--- a/board/freescale/t104xrdb/law.c
+++ b/board/freescale/t104xrdb/law.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
#ifdef CONFIG_MTD_NOR_FLASH
diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c
index 1fd24027000..787d03e1078 100644
--- a/board/freescale/t104xrdb/pci.c
+++ b/board/freescale/t104xrdb/pci.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <pci.h>
#include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/fsl_serdes.h>
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 2e29b3995d8..6551b2248ef 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -15,6 +15,7 @@
#include <fsl_esdhc.h>
#include <spi_flash.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/sleep.h"
#include "../common/spl.h"
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index 780043483df..fc496478397 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -13,6 +13,7 @@
#include <log.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/freescale/t104xrdb/t104xrdb.h b/board/freescale/t104xrdb/t104xrdb.h
index 678724c7e2b..8b009f83379 100644
--- a/board/freescale/t104xrdb/t104xrdb.h
+++ b/board/freescale/t104xrdb/t104xrdb.h
@@ -6,6 +6,7 @@
#ifndef __T104x_RDB_H__
#define __T104x_RDB_H__
+#include <asm/u-boot.h>
void fdt_fixup_board_enet(void *blob);
void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/freescale/t104xrdb/tlb.c b/board/freescale/t104xrdb/tlb.c
index 9dcba7933ff..cbfbf117861 100644
--- a/board/freescale/t104xrdb/tlb.c
+++ b/board/freescale/t104xrdb/tlb.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 56471b3988b..5a6728bd05b 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -13,6 +13,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
#include "ddr.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index e110f3babf1..61dc408c5b1 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -27,6 +27,7 @@
#include <fsl_dtsec.h>
#include <asm/fsl_serdes.h>
#include <hwconfig.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/qixis.h"
#include "../common/fman.h"
diff --git a/board/freescale/t208xqds/law.c b/board/freescale/t208xqds/law.c
index 40fdcf61c05..646d6ca9b4e 100644
--- a/board/freescale/t208xqds/law.c
+++ b/board/freescale/t208xqds/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c
index a03b11ccb50..46f558f5cfe 100644
--- a/board/freescale/t208xqds/pci.c
+++ b/board/freescale/t208xqds/pci.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <pci.h>
#include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/fsl_serdes.h>
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 4345c29c3b1..bf1b049af7f 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -15,6 +15,7 @@
#include <fsl_esdhc.h>
#include <spi_flash.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/qixis.h"
#include "t208xqds_qixis.h"
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index dedf722c695..a0ead05e37d 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/freescale/t208xqds/t208xqds.h b/board/freescale/t208xqds/t208xqds.h
index 50ebb6f6f98..8a77206b0df 100644
--- a/board/freescale/t208xqds/t208xqds.h
+++ b/board/freescale/t208xqds/t208xqds.h
@@ -6,6 +6,7 @@
#ifndef __CORENET_DS_H__
#define __CORENET_DS_H__
+#include <asm/u-boot.h>
void fdt_fixup_board_enet(void *blob);
void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/freescale/t208xqds/tlb.c b/board/freescale/t208xqds/tlb.c
index 1e501da363d..713bcde4566 100644
--- a/board/freescale/t208xqds/tlb.c
+++ b/board/freescale/t208xqds/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xrdb/cpld.c b/board/freescale/t208xrdb/cpld.c
index 81e220ff114..cf39623b7ae 100644
--- a/board/freescale/t208xrdb/cpld.c
+++ b/board/freescale/t208xrdb/cpld.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <command.h>
+#include <asm/io.h>
#include <linux/string.h>
#include "cpld.h"
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 1fbab36e1a2..86f1e7614cb 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -13,6 +13,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
#include "ddr.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index c16538850cd..de997db78f7 100644
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -24,6 +24,7 @@
#include <phy.h>
#include <fsl_dtsec.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
int board_eth_init(struct bd_info *bis)
{
diff --git a/board/freescale/t208xrdb/law.c b/board/freescale/t208xrdb/law.c
index d3b263f59d9..62e51a145e2 100644
--- a/board/freescale/t208xrdb/law.c
+++ b/board/freescale/t208xrdb/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c
index 45ab9223ae1..2f1a27b4250 100644
--- a/board/freescale/t208xrdb/pci.c
+++ b/board/freescale/t208xrdb/pci.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <pci.h>
#include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/fsl_serdes.h>
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index a9bf5fb6466..234fd145e7d 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -15,6 +15,7 @@
#include <fsl_esdhc.h>
#include <spi_flash.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/spl.h"
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index a18459841c6..e09f0efdda6 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/freescale/t208xrdb/t208xrdb.h b/board/freescale/t208xrdb/t208xrdb.h
index 22a496fb8cf..b830fe86c9b 100644
--- a/board/freescale/t208xrdb/t208xrdb.h
+++ b/board/freescale/t208xrdb/t208xrdb.h
@@ -6,6 +6,7 @@
#ifndef __CORENET_DS_H__
#define __CORENET_DS_H__
+#include <asm/u-boot.h>
void fdt_fixup_board_enet(void *blob);
void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/freescale/t208xrdb/tlb.c b/board/freescale/t208xrdb/tlb.c
index 542ab1e034f..488261828df 100644
--- a/board/freescale/t208xrdb/tlb.c
+++ b/board/freescale/t208xrdb/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 57cbde154f0..0e2ba282690 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -13,6 +13,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
#include "ddr.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index c815a3a4fa5..a81b3be878b 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -27,6 +27,7 @@
#include <fsl_dtsec.h>
#include <asm/fsl_serdes.h>
#include <hwconfig.h>
+#include <asm/u-boot.h>
#include "../common/fman.h"
#include "t4rdb.h"
diff --git a/board/freescale/t4rdb/law.c b/board/freescale/t4rdb/law.c
index 038f60565f7..4c195d5b023 100644
--- a/board/freescale/t4rdb/law.c
+++ b/board/freescale/t4rdb/law.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c
index c2bc05164dd..14dacb7e3c9 100644
--- a/board/freescale/t4rdb/pci.c
+++ b/board/freescale/t4rdb/pci.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <pci.h>
#include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/fsl_serdes.h>
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 79763119968..186327a3cde 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -18,6 +18,7 @@
#include <mmc.h>
#include <fsl_esdhc.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "t4rdb.h"
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index 6ab35ca9185..bee6d42c83d 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <netdev.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/freescale/t4rdb/t4rdb.h b/board/freescale/t4rdb/t4rdb.h
index 3f1fa7bbd24..0bb1b9cca1f 100644
--- a/board/freescale/t4rdb/t4rdb.h
+++ b/board/freescale/t4rdb/t4rdb.h
@@ -6,6 +6,7 @@
#ifndef __T4RDB_H__
#define __T4RDB_H__
+#include <asm/u-boot.h>
#undef CONFIG_SYS_NUM_FM1_DTSEC
#undef CONFIG_SYS_NUM_FM2_DTSEC
#define CONFIG_SYS_NUM_FM1_DTSEC 4
diff --git a/board/freescale/t4rdb/tlb.c b/board/freescale/t4rdb/tlb.c
index b927dd8484f..01e8e75825f 100644
--- a/board/freescale/t4rdb/tlb.c
+++ b/board/freescale/t4rdb/tlb.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index 98cb0140ad0..3641e5fb92f 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -17,6 +17,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <i2c.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/gardena/smart-gateway-at91sam/board.c b/board/gardena/smart-gateway-at91sam/board.c
index 3f402cfeee8..e50f0b8a476 100644
--- a/board/gardena/smart-gateway-at91sam/board.c
+++ b/board/gardena/smart-gateway-at91sam/board.c
@@ -12,6 +12,7 @@
#include <asm/arch/at91_common.h>
#include <asm/arch/clk.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c
index 14f45bf07da..ec42d5aa093 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -15,6 +15,7 @@
#include <env.h>
#include <fsl_esdhc_imx.h>
#include <hwconfig.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <power/pmic.h>
#include <power/ltc3676_pmic.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index b0cfd2e931a..84de3c3bb0f 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -24,6 +24,7 @@
#include <asm/io.h>
#include <asm/setup.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_mxc.h>
#include <env.h>
#include <hwconfig.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index e0e4bac1612..c9e742e58ee 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -20,6 +20,7 @@
#include <env.h>
#include <i2c.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include "gsc.h"
#include "common.h"
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index ba57a272187..d26ee0d313d 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -15,6 +15,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm-generic/gpio.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index 9c01661dc32..c758c8a885d 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -7,7 +7,7 @@
#ifdef CONFIG_GDSYS_LEGACY_DRIVERS
#include <common.h>
-
+#include <string.h>
#include <gdsys_fpga.h>
#include <linux/bitops.h>
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index 68a9595511c..9891baa1126 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -18,6 +18,7 @@
#include <tpm-v1.h>
#include <video_osd.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "../common/ihs_mdio.h"
#include "../../../drivers/board/gazerbeam.h"
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 446a756fbbe..bc2980f1a67 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -11,6 +11,7 @@
#include <i2c.h>
#include <init.h>
#include <spi.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 983d2847614..a6a2e797581 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -11,6 +11,7 @@
#include <i2c.h>
#include <init.h>
#include <spi.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index d31cba3d06e..0348b710075 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -36,6 +36,7 @@
#include <fsl_ddr_sdram.h>
#include <asm/fsl_serdes.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/gdsys/p1022/diu.c b/board/gdsys/p1022/diu.c
index 9a5d3c11e14..c67dc182cbb 100644
--- a/board/gdsys/p1022/diu.c
+++ b/board/gdsys/p1022/diu.c
@@ -10,6 +10,7 @@
#include <clock_legacy.h>
#include <command.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <asm/io.h>
#include <stdio_dev.h>
diff --git a/board/gdsys/p1022/law.c b/board/gdsys/p1022/law.c
index 5214109943a..30ff4eb93f7 100644
--- a/board/gdsys/p1022/law.c
+++ b/board/gdsys/p1022/law.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_ELBC_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/gdsys/p1022/tlb.c b/board/gdsys/p1022/tlb.c
index 00139ac5e39..5f63fad4cfe 100644
--- a/board/gdsys/p1022/tlb.c
+++ b/board/gdsys/p1022/tlb.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 3876b25420b..8df982450c2 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -13,6 +13,7 @@
#include <asm/arch/mx6-pins.h>
#include <env.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/libfdt.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 7018b29d5ac..02d17952d58 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -19,6 +19,7 @@
#include <asm/arch/iomux-mx53.h>
#include <asm/arch/clock.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/libfdt.h>
#include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/google/chromebook_coral/coral.c b/board/google/chromebook_coral/coral.c
index 12d4fe63cb0..4dbdfe343cc 100644
--- a/board/google/chromebook_coral/coral.c
+++ b/board/google/chromebook_coral/coral.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <command.h>
+#include <asm/u-boot.h>
int arch_misc_init(void)
{
diff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
index d0a740dd3f4..33ccaa6ff4c 100644
--- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c
+++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
@@ -21,6 +21,7 @@
#include <asm/mach-imx/gpio.h>
#include <asm/arch/clock.h>
#include <spl.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index fd5d745118c..aee71acc98e 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -20,6 +20,7 @@
#include <asm/mach-imx/gpio.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <asm/sections.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <fsl_esdhc_imx.h>
#include <mmc.h>
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 12480f5729d..2c88701a4dc 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -24,6 +24,7 @@
#include <miiphy.h>
#include <spl.h>
#include <watchdog.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 46c7138b303..0617e7978c9 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -23,6 +23,7 @@
#include <common.h>
#include <env.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <linux/fb.h>
#include <miiphy.h>
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index a790d453da0..1a47a845737 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -13,6 +13,7 @@
#include <netdev.h>
#include <scsi.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/io.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index 5a858dec64e..0c6cdb5c9cf 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_pl01x.h>
#include <errno.h>
#include <malloc.h>
diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c
index a14b9e44fa5..e302b169e1e 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -15,6 +15,7 @@
#include <asm/arch/hi3660.h>
#include <asm/armv8/mmu.h>
#include <asm/psci.h>
+#include <asm/u-boot.h>
#include <linux/arm-smccc.h>
#include <linux/delay.h>
#include <linux/psci.h>
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index 486e37f90a6..e0f290ef544 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -11,6 +11,7 @@
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_pl01x.h>
#include <asm/arch/hi3798cv200.h>
#include <asm/armv8/mmu.h>
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index 45c77a249a9..7ebae113370 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -18,6 +18,7 @@
#include <spi.h>
#include <asm/bitops.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index 182f79b9182..cbbbf280d8d 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
index bf772ff5dec..1d7a95073ab 100644
--- a/board/imgtec/boston/dt.c
+++ b/board/imgtec/boston/dt.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <fdt_support.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
int ft_board_setup(void *blob, struct bd_info *bd)
{
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 7ee175d40a5..8f45ff89e5f 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -14,6 +14,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <mach/jz4780.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 4a6fd785731..0a6ab37e12d 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -14,6 +14,7 @@
#include <pci_msc01.h>
#include <rtc.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 086d0522c78..2ad772c225f 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -18,6 +18,7 @@
#include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <i2c.h>
diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c
index fe4be28b13c..1bafcb977e1 100644
--- a/board/iomega/iconnect/iconnect.c
+++ b/board/iomega/iconnect/iconnect.c
@@ -12,6 +12,7 @@
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "iconnect.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 02ae7df04db..8844bb42720 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -30,6 +30,7 @@
#include <cpsw.h>
#include <fdt_support.h>
#include <mtd_node.h>
+#include <asm/u-boot.h>
#include <jffs2/load_kernel.h>
#include "board.h"
diff --git a/board/isee/igep00x0/common.c b/board/isee/igep00x0/common.c
index 3fdf83e845c..e4ea96f076e 100644
--- a/board/isee/igep00x0/common.c
+++ b/board/isee/igep00x0/common.c
@@ -7,6 +7,7 @@
#include <asm/omap_mmc.h>
#include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <jffs2/load_kernel.h>
#include <linux/delay.h>
#include <linux/mtd/rawnand.h>
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 836a3f91957..098ef3f9664 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -20,6 +20,7 @@
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/rawnand.h>
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index a5ee4a8a519..42e540ae1e4 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -16,6 +16,7 @@
#include <asm/arch/clock.h>
#include <asm/gpio.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <power/pmic.h>
#include <fsl_pmic.h>
#include "kp_id_rev.h"
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
index 110496d9950..c1ec01f21a0 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <miiphy.h>
#include <usb.h>
+#include <asm/u-boot.h>
#include <usb/ehci-ci.h>
#include <led.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index 4bd2e8d0e87..d5c1c762254 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -17,6 +17,7 @@
#include <asm/io.h>
#include <errno.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 4f64a1805f7..bada40e1e62 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -17,6 +17,7 @@
#include <netdev.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c
index 06a4e67881f..e447083f13a 100644
--- a/board/keymile/common/qrio.c
+++ b/board/keymile/common/qrio.c
@@ -5,6 +5,7 @@
*/
#include <common.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include "common.h"
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 1e5c33b5fd5..f0422d906e7 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -27,6 +27,7 @@
#include <asm/mmu.h>
#include <asm/processor.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <post.h>
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
index 62100b19492..104e30875d7 100644
--- a/board/keymile/km83xx/km83xx_i2c.c
+++ b/board/keymile/km83xx/km83xx_i2c.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <i2c.h>
+#include <asm/fsl_i2c.h>
#include <asm/io.h>
#include <linux/ctype.h>
#include <linux/delay.h>
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index f4235b377fc..3f6aa49416f 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -25,6 +25,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
#include "../common/common.h"
diff --git a/board/keymile/kmp204x/eth.c b/board/keymile/kmp204x/eth.c
index 29c5b339ae8..0cac3ecdad3 100644
--- a/board/keymile/kmp204x/eth.c
+++ b/board/keymile/kmp204x/eth.c
@@ -10,6 +10,7 @@
#include <fm_eth.h>
#include <fsl_mdio.h>
#include <phy.h>
+#include <asm/u-boot.h>
int board_eth_init(struct bd_info *bis)
{
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 29dde7a8024..1d491bda92f 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -13,6 +13,7 @@
#include <image.h>
#include <init.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h
index 3b858a55711..077954faebb 100644
--- a/board/keymile/kmp204x/kmp204x.h
+++ b/board/keymile/kmp204x/kmp204x.h
@@ -5,4 +5,5 @@
*/
+#include <asm/u-boot.h>
void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/keymile/kmp204x/law.c b/board/keymile/kmp204x/law.c
index 2d83dfea15f..2c702dc631b 100644
--- a/board/keymile/kmp204x/law.c
+++ b/board/keymile/kmp204x/law.c
@@ -12,6 +12,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
#ifdef CONFIG_SYS_BMAN_MEM_PHYS
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index cdb498da03b..bfc853a2e82 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <pci.h>
#include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/keymile/kmp204x/tlb.c b/board/keymile/kmp204x/tlb.c
index a268bd8e959..72efe5044b5 100644
--- a/board/keymile/kmp204x/tlb.c
+++ b/board/keymile/kmp204x/tlb.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index 02c87a031c3..5b0c198940a 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -14,6 +14,7 @@
#include <asm/gpio.h>
#include <netdev.h>
#include <i2c.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index adb091ce4fd..79cd4a4bc1f 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -14,6 +14,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include "../drivers/ddr/marvell/a38x/ddr3_init.h"
#include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 383d3705734..1825cd04976 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/device-internal.h>
#include <ahci.h>
#include <env.h>
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c
index 3d22f2019e9..eddea6e2915 100644
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -23,6 +23,7 @@
#include <mmc.h>
#include <fsl_esdhc_imx.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <asm/arch/mx6-ddr.h>
diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c
index f221f05261a..9f8533faa9e 100644
--- a/board/l+g/vinco/vinco.c
+++ b/board/l+g/vinco/vinco.c
@@ -31,6 +31,7 @@
#include <nand.h>
#include <spi.h>
#include <version.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/laird/wb45n/wb45n.c b/board/laird/wb45n/wb45n.c
index 5e1ef8a49ac..fa96682625a 100644
--- a/board/laird/wb45n/wb45n.c
+++ b/board/laird/wb45n/wb45n.c
@@ -14,6 +14,7 @@
#include <asm/arch/gpio.h>
#include <net.h>
#include <netdev.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index f1a7555ac9c..13ac53ab21a 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -20,6 +20,7 @@
#include <spl.h>
#include <asm/arch/atmel_mpddrc.h>
#include <asm/arch/at91_wdt.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 5e5c8c1198f..6afb02bc2b0 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -22,6 +22,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/davinci_misc.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <hwconfig.h>
#include <asm/mach-types.h>
diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index 15c088d7348..3de18af2a1d 100644
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -11,6 +11,7 @@
#include <env.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <linux/usb/musb.h>
#include <asm/omap_musb.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index c47f43a9164..c68e04815e6 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -26,6 +26,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index a48eba58f9d..b910b3fbf0e 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -13,6 +13,7 @@
#include <serial.h>
#include <spl.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <asm/io.h>
diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index 1b49526fba4..db0ae9bc4ca 100644
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -14,6 +14,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 1153a7e19f8..69cf7def1f6 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -22,6 +22,7 @@
#include <asm/arch/sys_proto.h>
#include <serial.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index cd11b0ada77..eee2e00b78e 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -25,6 +25,7 @@
#include <asm/arch/iomux-mx28.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <miiphy.h>
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index f0141659282..e0e57868546 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -26,6 +26,7 @@
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/musb.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/gpio.h>
#include <linux/usb/ch9.h>
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index 0d53548dcb4..f065aa96eca 100644
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -19,6 +19,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/arch/clock.h>
#include <asm/arch/crm_regs.h>
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 2379b521904..e5a9ffdda55 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -29,6 +29,7 @@
#include <asm/gpio.h>
#include <asm/omap_mmc.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
#include <linux/mtd/rawnand.h>
#include <asm/omap_musb.h>
#include <linux/errno.h>
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c
index e92132ad19a..cb6bc6f531a 100644
--- a/board/maxbcm/maxbcm.c
+++ b/board/maxbcm/maxbcm.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/mbus.h>
#include "../drivers/ddr/marvell/axp/ddr3_hw_training.h"
diff --git a/board/mediatek/mt7622/mt7622_rfb.c b/board/mediatek/mt7622/mt7622_rfb.c
index 0504d6177fd..021bbb55cfe 100644
--- a/board/mediatek/mt7622/mt7622_rfb.c
+++ b/board/mediatek/mt7622/mt7622_rfb.c
@@ -9,6 +9,7 @@
#include <env.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c
index 090270b20d1..180f55f65d7 100644
--- a/board/mediatek/mt7623/mt7623_rfb.c
+++ b/board/mediatek/mt7623/mt7623_rfb.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <mmc.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mediatek/mt7629/mt7629_rfb.c b/board/mediatek/mt7629/mt7629_rfb.c
index d1bca6d62ef..b376a00fb95 100644
--- a/board/mediatek/mt7629/mt7629_rfb.c
+++ b/board/mediatek/mt7629/mt7629_rfb.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mediatek/mt8512/mt8512.c b/board/mediatek/mt8512/mt8512.c
index ac3adb80122..dc369aba8ec 100644
--- a/board/mediatek/mt8512/mt8512.c
+++ b/board/mediatek/mt8512/mt8512.c
@@ -8,6 +8,7 @@
#include <log.h>
#include <wdt.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mediatek/mt8518/mt8518_ap1.c b/board/mediatek/mt8518/mt8518_ap1.c
index 5a300821c9b..23480167b95 100644
--- a/board/mediatek/mt8518/mt8518_ap1.c
+++ b/board/mediatek/mt8518/mt8518_ap1.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/printk.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mediatek/pumpkin/pumpkin.c b/board/mediatek/pumpkin/pumpkin.c
index 666e4d6a26f..0020fd6b33c 100644
--- a/board/mediatek/pumpkin/pumpkin.c
+++ b/board/mediatek/pumpkin/pumpkin.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <asm/u-boot.h>
int board_init(void)
{
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index eee12ccdc68..4c7fd84e281 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -27,6 +27,7 @@
#include <gzip.h>
#include <i2c.h>
#include <ipu_pixfmt.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/errno.h>
#include <linux/fb.h>
diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_icicle/mpfs_icicle.c
index 8381361ec36..7ab3788f232 100644
--- a/board/microchip/mpfs_icicle/mpfs_icicle.c
+++ b/board/microchip/mpfs_icicle/mpfs_icicle.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <init.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#define MPFS_SYSREG_SOFT_RESET ((unsigned int *)0x20002088)
diff --git a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
index 315169ba661..9993e006f6e 100644
--- a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
+++ b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/mbus.h>
#include <linux/io.h>
diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c
index 5d6cb24966d..d4af394670c 100644
--- a/board/mini-box/picosam9g45/picosam9g45.c
+++ b/board/mini-box/picosam9g45/picosam9g45.c
@@ -22,6 +22,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/clk.h>
#include <lcd.h>
+#include <asm/u-boot.h>
#include <linux/mtd/rawnand.h>
#include <atmel_lcdc.h>
#include <atmel_mci.h>
diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c
index 87607bd4898..1a44e2df47f 100644
--- a/board/mpc8308_p1m/mpc8308_p1m.c
+++ b/board/mpc8308_p1m/mpc8308_p1m.c
@@ -8,6 +8,7 @@
#include <i2c.h>
#include <init.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index 2aca78ac794..c61e44ee8b4 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <led.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c
index ebb9060f3d7..584062c9ee9 100644
--- a/board/mscc/luton/luton.c
+++ b/board/mscc/luton/luton.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <led.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
enum {
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index d26b93f12bd..ace20caf10e 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -15,6 +15,7 @@
#include <led.h>
#include <wait_bit.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c
index 0da835828f8..d7b42d177a7 100644
--- a/board/mscc/serval/serval.c
+++ b/board/mscc/serval/serval.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <led.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
enum {
diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c
index 818863a5df5..123b69e9981 100644
--- a/board/mscc/servalt/servalt.c
+++ b/board/mscc/servalt/servalt.c
@@ -9,6 +9,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <led.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
enum {
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 20d82447b01..e58bf3acc2e 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -38,6 +38,7 @@
#include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/mmc_host_def.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "rx51.h"
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index 1edebe5db9b..388f8630be1 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -13,6 +13,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/io.h>
#include <common.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 0f4796b559b..4631fa21f5b 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -10,6 +10,7 @@
#include <i2c.h>
#include <log.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/libfdt.h>
#include <asm/arch/gpio.h>
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index e96edcc1c91..14b151d8a16 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -9,6 +9,7 @@
#include <i2c.h>
#include <log.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <asm/arch-tegra/cboot.h>
#include <linux/string.h>
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index 2a16b1e3b46..e40644388ec 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <fdtdec.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/libfdt.h>
#include <pca953x.h>
diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
index d1e189cbb6e..bfaf18fca47 100644
--- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
+++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
@@ -17,6 +17,7 @@
#ifdef CONFIG_LED_STATUS
#include <status_led.h>
#endif
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index b2e435f6908..9051a0ca0d3 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -15,6 +15,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <miiphy.h>
#include <netdev.h>
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
index fea4aa33655..175223dbc75 100644
--- a/board/phytec/pcl063/spl.c
+++ b/board/phytec/pcl063/spl.c
@@ -16,6 +16,7 @@
#include <asm/arch/crm_regs.h>
#include <asm/arch/sys_proto.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
/* Configuration for Micron MT41K256M16TW-107 IT:P, 32M x 16 x 8 -> 256MiB */
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index f9cf4abd474..ce545cfa844 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -18,6 +18,7 @@
#include <env.h>
#include <led.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index a2304b764d6..dd8c91c176d 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -18,6 +18,7 @@
#include <asm/mach-imx/boot_mode.h>
#include <asm/arch/sys_proto.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 996fcedfa2c..225fdd55cc5 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -21,6 +21,7 @@
#include <asm/mach-imx/mxc_i2c.h>
#include <asm/mach-imx/spi.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index 5ca94152049..19c1033c9d7 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -18,6 +18,7 @@
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <power/tps65910.h>
#include <jffs2/load_kernel.h>
#include <mtd_node.h>
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index 8a82a4591ac..4b588206c22 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -15,6 +15,7 @@
#include <asm/global_data.h>
#include <asm/system.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/arm-smccc.h>
#include <linux/kernel.h>
#include <scsi.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index 578f5c73b6c..5fe7ed9a3a8 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -15,6 +15,7 @@
#include <asm/arch/iomux-mx28.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <miiphy.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index f57091739ec..21437168044 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -12,6 +12,7 @@
#include <asm/mipsregs.h>
#include <asm/io.h>
#include <netdev.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 1aa67f96d3d..bac8b1ff899 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -18,6 +18,7 @@
#include <fdt_support.h>
#include <asm/arch/dram.h>
#include <asm/arch/misc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index 877e34c2101..847022939d0 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -11,6 +11,7 @@
#include <env.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/arm-smccc.h>
#include <linux/psci.h>
#include <common.h>
diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c
index f9bc07649e0..afbfdd997a1 100644
--- a/board/raidsonic/ib62x0/ib62x0.c
+++ b/board/raidsonic/ib62x0/ib62x0.c
@@ -14,6 +14,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
#include "ib62x0.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 6b1fa5fc144..e76fc2cca94 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -19,6 +19,7 @@
#include <asm/arch/msg.h>
#include <asm/arch/sdhci.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_bcm283x_mu.h>
#ifdef CONFIG_ARM64
#include <asm/armv8/mmu.h>
diff --git a/board/renesas/MigoR/migo_r.c b/board/renesas/MigoR/migo_r.c
index f2f4c657534..61564a2f50f 100644
--- a/board/renesas/MigoR/migo_r.c
+++ b/board/renesas/MigoR/migo_r.c
@@ -15,6 +15,7 @@
#include <netdev.h>
#include <asm/io.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
int checkboard(void)
{
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 854c47636d3..97379858e4f 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -13,6 +13,7 @@
#include <malloc.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <env_internal.h>
#include <asm/processor.h>
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 9671382f2a3..77d4cc8bd6c 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -21,6 +21,7 @@
#include <asm/mach-types.h>
#include <asm/processor.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <env.h>
#include <hang.h>
diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
index 99e7dd6e1e1..f9c3f324f83 100644
--- a/board/renesas/condor/condor.c
+++ b/board/renesas/condor/condor.c
@@ -14,6 +14,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index bc4ce95a727..643bfce33ad 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -14,6 +14,7 @@
#include <netdev.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <asm/processor.h>
#include <asm/mach-types.h>
diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
index f9e553feaa7..a6602a52506 100644
--- a/board/renesas/eagle/eagle.c
+++ b/board/renesas/eagle/eagle.c
@@ -14,6 +14,7 @@
#include <netdev.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <asm/processor.h>
#include <asm/mach-types.h>
diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
index 620d250284a..a01ae27e5b2 100644
--- a/board/renesas/ebisu/ebisu.c
+++ b/board/renesas/ebisu/ebisu.c
@@ -14,6 +14,7 @@
#include <netdev.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <asm/processor.h>
#include <asm/mach-types.h>
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index 56cdc73b1a7..5841da94fc1 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -13,6 +13,7 @@
#include <malloc.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <env_internal.h>
#include <asm/processor.h>
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index ac989eb29c2..22b53743315 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -10,6 +10,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#define RZA1_WDT_BASE 0xfcfe0000
#define WTCSR 0x00
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index b0a66ea2669..e20fed98631 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -14,6 +14,7 @@
#include <malloc.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <env_internal.h>
#include <asm/processor.h>
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index add4eef3d53..636a7b27747 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -17,6 +17,7 @@
#include <netdev.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <asm/processor.h>
#include <asm/mach-types.h>
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index b3e4c08d74d..368cf9550a3 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -14,6 +14,7 @@
#include <malloc.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <env_internal.h>
#include <asm/processor.h>
diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c
index 4b9959a4326..e637b4f9876 100644
--- a/board/renesas/r2dplus/r2dplus.c
+++ b/board/renesas/r2dplus/r2dplus.c
@@ -11,6 +11,7 @@
#include <netdev.h>
#include <asm/processor.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
int checkboard(void)
{
diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c
index 422381ca780..28c99bf5854 100644
--- a/board/renesas/r7780mp/r7780mp.c
+++ b/board/renesas/r7780mp/r7780mp.c
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <asm/pci.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include "r7780mp.h"
int checkboard(void)
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 1d645a82aaf..4f56627b812 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -11,6 +11,7 @@
#include <dm.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/uclass-internal.h>
#include <asm/arch/rmobile.h>
#include <linux/libfdt.h>
diff --git a/board/renesas/rcar-common/gen3-spl.c b/board/renesas/rcar-common/gen3-spl.c
index fd6e5054a6d..aecc053dc10 100644
--- a/board/renesas/rcar-common/gen3-spl.c
+++ b/board/renesas/rcar-common/gen3-spl.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <asm/io.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#define RCAR_CNTC_BASE 0xE6080000
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 30596822299..8da12ea9010 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -15,6 +15,7 @@
#include <netdev.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <asm/processor.h>
#include <asm/mach-types.h>
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 07c51e7147e..4df154a2a91 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -15,6 +15,7 @@
#include <asm/mmc.h>
#include <spi.h>
#include <spi_flash.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index 8f6f2eee904..de719983979 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -15,6 +15,7 @@
#include <asm/mmc.h>
#include <spi.h>
#include <spi_flash.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index a81bdbf9cdc..2adca5dc6dc 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -15,6 +15,7 @@
#include <asm/mmc.h>
#include <spi.h>
#include <spi_flash.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
int checkboard(void)
diff --git a/board/renesas/sh7763rdp/sh7763rdp.c b/board/renesas/sh7763rdp/sh7763rdp.c
index 73a53c1e5ac..35c77be1bca 100644
--- a/board/renesas/sh7763rdp/sh7763rdp.c
+++ b/board/renesas/sh7763rdp/sh7763rdp.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <asm/io.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
#define CPU_CMDREG 0xB1000006
#define PDCR 0xffef0006
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 05af5f4d68b..c2667bb9c8a 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -14,6 +14,7 @@
#include <malloc.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <env_internal.h>
#include <asm/processor.h>
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 3fdf936ddca..163137a65c6 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -15,6 +15,7 @@
#include <netdev.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <env_internal.h>
#include <asm/processor.h>
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 09711559aef..0bec9954c36 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -13,6 +13,7 @@
#include <netdev.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_sh.h>
#include <asm/processor.h>
#include <asm/mach-types.h>
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 5be2c5e192b..b5b79b28391 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <vsprintf.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index 95c0dec4db5..ec73ced7604 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index 8d5825c7f13..fa0d9f2467e 100644
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -13,6 +13,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index 2742a7f32b2..d1525b4a856 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -13,6 +13,7 @@
#include <asm/arch/pinmux.h>
#include <asm/arch/dwmmc.h>
#include <asm/arch/power.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 9eea11f755b..ae66bc73fd1 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -33,6 +33,7 @@
#include <stdio_dev.h>
#include <usb.h>
#include <dwc3-uboot.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <samsung/misc.h>
#include <dm/pinctrl.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 5fb01bba055..1631e68e713 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -12,6 +12,7 @@
#include <asm/gpio.h>
#include <asm/arch/mmc.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/printk.h>
#include <power/pmic.h>
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index 69ed715403f..f343a6f9dfe 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -14,6 +14,7 @@
#include <asm/arch/sromc.h>
#include <netdev.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 8811cbb9ad0..0be4ddf92d8 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -16,6 +16,7 @@
#include <asm/arch/periph.h>
#include <asm/arch/pinmux.h>
#include <asm/arch/sromc.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 9ef11b8471c..732f70f576c 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -17,6 +17,7 @@
#include <asm/arch/pinmux.h>
#include <asm/arch/watchdog.h>
#include <ld9040.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <power/pmic.h>
#include <usb.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index b1bed64910c..9773074d088 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -15,6 +15,7 @@
#include <asm/global_data.h>
#include <asm/test.h>
#include <asm/u-boot-sandbox.h>
+#include <asm/u-boot.h>
/*
* Pointer to initial global data area
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index f46b02e38e5..c6cce3b3fa6 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -20,6 +20,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index b440a0b17e9..7e1beeafa6c 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -21,6 +21,7 @@
#if defined(CONFIG_OF_LIBFDT)
#include <linux/libfdt.h>
#endif
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sbc8548/law.c b/board/sbc8548/law.c
index 97271ea6f66..af281d338f0 100644
--- a/board/sbc8548/law.c
+++ b/board/sbc8548/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* LAW(Local Access Window) configuration:
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index 13a66507ffc..b3c1da920a8 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -24,6 +24,7 @@
#include <netdev.h>
#include <tsec.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/sbc8548/tlb.c b/board/sbc8548/tlb.c
index 8ad01d10e49..4fcc1f2710c 100644
--- a/board/sbc8548/tlb.c
+++ b/board/sbc8548/tlb.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/sbc8641d/law.c b/board/sbc8641d/law.c
index dc4696d123f..446d63bf1f0 100644
--- a/board/sbc8641d/law.c
+++ b/board/sbc8641d/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* LAW (Local Access Window) configuration:
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index a67092daf47..cc17f80d07d 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -22,6 +22,7 @@
#include <asm/fsl_pci.h>
#include <fsl_ddr_sdram.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
index 3a04b1a634c..a5b25b60fc4 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -16,6 +16,7 @@
#include <asm/arch/iomux-mx28.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/mii.h>
#include <miiphy.h>
#include <netdev.h>
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index a061d7d8afb..138c6e04291 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -14,6 +14,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 6f34bd73f0d..03418707a85 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -27,6 +27,7 @@
#ifndef CONFIG_SPL
#include <asm/arch-imx8/clock.h>
#endif
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "../common/factoryset.h"
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index da893629172..d81764832de 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -10,6 +10,7 @@
#include <spl.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <dm/device.h>
#include <dm/uclass-internal.h>
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 19f27f6805a..db063659a47 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -34,6 +34,7 @@
#include <cpsw.h>
#include <watchdog.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../common/factoryset.h"
diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
index 2acd3226cf2..fbccbb0f6da 100644
--- a/board/siemens/corvus/board.c
+++ b/board/siemens/corvus/board.c
@@ -31,6 +31,7 @@
#include <netdev.h>
#endif
#include <spi.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_USB_GADGET_ATMEL_USBA
#include <asm/arch/atmel_usba_udc.h>
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index b512bdbfabf..2c15cfdda3f 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -35,6 +35,7 @@
#include <miiphy.h>
#include <cpsw.h>
#include <watchdog.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "board.h"
#include "../common/factoryset.h"
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 7f36848b265..8ab3610da7d 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -28,6 +28,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "../../../drivers/video/da8xx-fb.h"
#include <asm/io.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 22d8c40a53b..84053b10d84 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -34,6 +34,7 @@
#include <cpsw.h>
#include <video.h>
#include <watchdog.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "board.h"
diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
index d500a6214d5..f3415e54517 100644
--- a/board/siemens/smartweb/smartweb.c
+++ b/board/siemens/smartweb/smartweb.c
@@ -32,6 +32,7 @@
#include <asm/arch/gpio.h>
#include <asm/gpio.h>
#include <watchdog.h>
+#include <asm/u-boot.h>
# include <net.h>
#ifndef CONFIG_DM_ETH
# include <netdev.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index cad16f90656..3fb7d6bca22 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -28,6 +28,7 @@
#include <asm/arch/atmel_serial.h>
#include <asm/arch/clk.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/mtd/rawnand.h>
#include <atmel_mci.h>
#include <asm/arch/at91_spi.h>
diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c
index 57753ba50ba..3542bd1ecab 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -10,6 +10,7 @@
#include <env.h>
#include <init.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/bug.h>
#include <linux/delay.h>
diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c
index cbcb23cf5c2..7b7face393d 100644
--- a/board/sipeed/maix/maix.c
+++ b/board/sipeed/maix/maix.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <fdt_support.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
phys_size_t get_effective_memsize(void)
{
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index bfe4634fdd7..cbf3a5952be 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -12,6 +12,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/socrates/law.c b/board/socrates/law.c
index 840941b63e5..5010e0cee36 100644
--- a/board/socrates/law.c
+++ b/board/socrates/law.c
@@ -12,6 +12,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* LAW(Local Access Window) configuration:
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 0c9262d3540..711ddcf256e 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -21,6 +21,7 @@
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <flash.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c
index de80c3c0e57..4dc0f7dbcda 100644
--- a/board/socrates/tlb.c
+++ b/board/socrates/tlb.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 1c5863714c6..93670b7a946 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -20,6 +20,7 @@
#include <asm/io.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/sizes.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index 34ce6a13003..6eec9815f28 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -14,6 +14,7 @@
#include <asm/io.h>
#include <asm/gpio.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index a4d60e1540c..46ffc026f34 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -14,6 +14,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index e56e32e8c84..9057ac9470a 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -24,6 +24,7 @@
#include <asm/arch/mxc_hdmi.h>
#include <env.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c
index 076c641d8a9..55470cd2d17 100644
--- a/board/somlabs/visionsom-6ull/visionsom-6ull.c
+++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c
@@ -22,6 +22,7 @@
#include <fsl_esdhc_imx.h>
#include <i2c.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <mmc.h>
#include <netdev.h>
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
index a5945383932..1fe825182f3 100644
--- a/board/spear/spear300/spear300.c
+++ b/board/spear/spear300/spear300.c
@@ -10,6 +10,7 @@
#include <netdev.h>
#include <nand.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/mtd/fsmc_nand.h>
#include <asm/mach-types.h>
#include <asm/arch/hardware.h>
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index b4c3c0c5c78..721b1dd4aa5 100644
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -11,6 +11,7 @@
#include <netdev.h>
#include <nand.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/mtd/fsmc_nand.h>
#include <asm/mach-types.h>
#include <asm/arch/hardware.h>
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index 291337b8049..f726f8fccf0 100644
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
@@ -11,6 +11,7 @@
#include <netdev.h>
#include <nand.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/mtd/fsmc_nand.h>
#include <asm/mach-types.h>
#include <asm/arch/hardware.h>
diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
index 4706c52c127..0c01f1fbf9e 100644
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
@@ -10,6 +10,7 @@
#include <netdev.h>
#include <nand.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/mtd/fsmc_nand.h>
#include <asm/mach-types.h>
#include <asm/arch/hardware.h>
diff --git a/board/spear/x600/x600.c b/board/spear/x600/x600.c
index 9c30581ec01..fcc7524121c 100644
--- a/board/spear/x600/x600.c
+++ b/board/spear/x600/x600.c
@@ -20,6 +20,7 @@
#include <asm/arch/hardware.h>
#include <asm/arch/spr_defs.h>
#include <asm/arch/spr_misc.h>
+#include <asm/u-boot.h>
#include <linux/mtd/fsmc_nand.h>
#include "fpga.h"
diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c
index b87468cca21..90eefd5cd1f 100644
--- a/board/st/stih410-b2260/board.c
+++ b/board/st/stih410-b2260/board.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/usb/otg.h>
#include <dwc3-sti-glue.h>
#include <dwc3-uboot.h>
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index 9d8fc9f5a2e..3e10eb59e0b 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -16,6 +16,7 @@
#include <init.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/stm32.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 35e71380b89..76dd3a2a0a2 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/stm32.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index fcc34e7955a..0a024ffe1c4 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -10,6 +10,7 @@
#include <init.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/io.h>
#include <asm/arch/stm32.h>
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index 40450ca914b..07471d54e8e 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -24,6 +24,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/syscfg.h>
#include <asm/gpio.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c
index 53bf0922197..8e43be5fa86 100644
--- a/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c
index 53bf0922197..8e43be5fa86 100644
--- a/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@ -9,6 +9,7 @@
#include <init.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 68c3111f518..c941628eb4c 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -34,6 +34,7 @@
#include <asm/gpio.h>
#include <asm/arch/stm32.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <jffs2/load_kernel.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 72399cf5f65..e2d62a7ede9 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -17,6 +17,7 @@
#include <netdev.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_pl01x.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ste/stemmy/stemmy.c b/board/ste/stemmy/stemmy.c
index b9b2a6fddc2..796541ad90c 100644
--- a/board/ste/stemmy/stemmy.c
+++ b/board/ste/stemmy/stemmy.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 193ec8cff57..a34b1f4cf17 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -29,6 +29,7 @@
#include <asm/arch/mmc.h>
#include <asm/arch/spl.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index a3e5efad7c6..71eba4842b3 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -22,6 +22,7 @@
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux-mx25.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index ac1b8231281..a35efc9848a 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -10,6 +10,7 @@
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/gpio.h>
#include <asm/mach-imx/iomux-v3.h>
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 4821925c026..8095053fd60 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -30,6 +30,7 @@
#include <i2c.h>
#include <miiphy.h>
#include <cpsw.h>
+#include <asm/u-boot.h>
#include <power/tps65217.h>
#include <power/tps65910.h>
#include <env_internal.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 6b9c4f4373c..90592900ec6 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -22,6 +22,7 @@
#include <asm/mach-imx/video.h>
#include <asm/mach-imx/iomux-v3.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <miiphy.h>
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
index 7b6cdd6c3b1..dd5e154e671 100644
--- a/board/technexion/pico-imx6/spl.c
+++ b/board/technexion/pico-imx6/spl.c
@@ -13,6 +13,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index c9f553bdfd5..0d972158b1c 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -20,6 +20,7 @@
#include <common.h>
#include <miiphy.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <usb.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index faee99e8d29..bea16a7ab9f 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -15,6 +15,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/boot_mode.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <spl.h>
#include <linux/string.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 2d749dac19a..b7582f2148a 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -18,6 +18,7 @@
#include <common.h>
#include <i2c.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <power/pmic.h>
#include <power/pfuze3000_pmic.h>
#include "../../freescale/common/pfuze.h"
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index ccb094f1884..3739706dee1 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -18,6 +18,7 @@
#include <asm/gpio.h>
#include <fsl_esdhc_imx.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#if defined(CONFIG_SPL_BUILD)
diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c
index 951e3e1985b..2ac96146f43 100644
--- a/board/technexion/pico-imx8mq/pico-imx8mq.c
+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c
@@ -21,6 +21,7 @@
#include <asm/mach-imx/gpio.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <asm/arch/clock.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <spl.h>
#include <power/pmic.h>
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index b434e1e16f2..02b2a01cae7 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -16,6 +16,7 @@
#include <asm/mach-imx/gpio.h>
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <errno.h>
#include <fsl_esdhc_imx.h>
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index 0c9dca31e67..157ad85d4f7 100644
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -18,6 +18,7 @@
#include <asm/arch/gpio.h>
#include <asm/gpio.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
#include <usb.h>
#include <asm/ehci-omap.h>
diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
index b9cce821d96..7daac4e53aa 100644
--- a/board/technologic/ts4600/ts4600.c
+++ b/board/technologic/ts4600/ts4600.c
@@ -22,6 +22,7 @@
#include <asm/arch/iomux-mx28.h>
#include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <miiphy.h>
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index a309e58b27f..61ec4ffb831 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -16,6 +16,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux-mx51.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index fb3d1fc4260..9664a8c0ef3 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -19,6 +19,7 @@
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mbus.h>
#ifdef CONFIG_NET
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index be474a8472c..7103dc454d8 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -37,6 +37,7 @@
#include <i2c.h>
#include <miiphy.h>
#include <cpsw.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
index b1017d6c9b7..b7f6ce21243 100644
--- a/board/ti/am3517crane/am3517crane.c
+++ b/board/ti/am3517crane/am3517crane.c
@@ -19,6 +19,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/mach-types.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include "am3517crane.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index ba479672c66..463dccc0ccb 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -11,6 +11,7 @@
#include <eeprom.h>
#include <image.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <env.h>
#include <fdt_support.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index d9b28dff52b..fca15a9a629 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -33,6 +33,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/omap.h>
#include <usb.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <linux/usb/gadget.h>
#include <dwc3-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 655789d9b9b..e0c6d6fa003 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -22,6 +22,7 @@
#include <env.h>
#include <spl.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 25297b0ae0c..752cb584c66 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -25,6 +25,7 @@
#endif
#include <twl4030.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/mtd/rawnand.h>
#include <asm/io.h>
#include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 851471cd130..fa56ebb2533 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -20,6 +20,7 @@
#include <sata.h>
#include <serial.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <asm/gpio.h>
#include <usb.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 573b75e076b..664ddeb4fe9 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -29,6 +29,7 @@
#include <twl4030.h>
#include <asm/mach-types.h>
#include <asm/omap_musb.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mtd/rawnand.h>
#include <linux/usb/ch9.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 58ecc188831..00d5cb2e685 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -22,6 +22,7 @@
#include <spl.h>
#include <asm/arch/sys_proto.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <dm/uclass-internal.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 078b89073fc..ba08c22f942 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "board.h"
#include <env.h>
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index b6ef7164d9f..979b1febc02 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -18,6 +18,7 @@
#include <fdtdec.h>
#include <i2c.h>
#include <remoteproc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 4777622156b..a6c75bda3c3 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -16,6 +16,7 @@
#include <tca642x.h>
#include <usb.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/usb/gadget.h>
#include <dwc3-uboot.h>
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index fda8d5f3c83..c36690eec17 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -18,6 +18,7 @@
#include <asm/gpio.h>
#include <env.h>
#include <twl6030.h>
+#include <asm/u-boot.h>
#include "panda_mux_data.h"
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
index 4895bfafd80..fe12d6e8913 100644
--- a/board/ti/sdp4430/sdp.c
+++ b/board/ti/sdp4430/sdp.c
@@ -13,6 +13,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "sdp4430_mux_data.h"
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index 2d42af6b809..12c56a607c9 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -22,6 +22,7 @@
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/mem.h>
#include <asm/arch/mux.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/timll/devkit3250/devkit3250.c b/board/timll/devkit3250/devkit3250.c
index 3c744b943f4..a90a0d34349 100644
--- a/board/timll/devkit3250/devkit3250.c
+++ b/board/timll/devkit3250/devkit3250.c
@@ -14,6 +14,7 @@
#include <asm/arch/wdt.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 5af88318062..e1b33d091ee 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -29,6 +29,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/arch/mem.h>
#include <asm/mach-types.h>
+#include <asm/u-boot.h>
#include "devkit8000.h"
#include <asm/gpio.h>
#ifdef CONFIG_DRIVER_DM9000
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 6e8594a6472..1c4ff3d1984 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -7,6 +7,7 @@
#include <cpu_func.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 2883f1b98c5..6d907817593 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -15,6 +15,7 @@
#include <asm/arch/pinmux.h>
#include <env_internal.h>
#include <pci_tegra.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index d17f90f86fd..db7746e78c8 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -13,6 +13,7 @@
#include <init.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index 0396eea56b5..cad2f32b665 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -17,6 +17,7 @@
#include <dm.h>
#include <i2c.h>
#include <pci_tegra.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "../common/tdx-common.h"
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 8e9b74f6479..ee073962964 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <asm/arch/clock.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 9531ec64a5d..09f3525bb45 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -7,6 +7,7 @@
#include <cpu_func.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 1f18552b57c..dc026fd3e40 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -13,6 +13,7 @@
#include <init.h>
#include <net.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 11560ee0677..7d9390cf5eb 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -18,6 +18,7 @@
#include <asm/io.h>
#include <common.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/serial_mxc.h>
#include <fdt_support.h>
#include <fsl_esdhc_imx.h>
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index bc7a79f0b34..81b7f72d6da 100644
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -17,6 +17,7 @@
#include <asm/arch/regs-uart.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <dm/platdata.h>
#include <dm/platform_data/pxa_mmc_gen.h>
#include <dm/platform_data/serial_pxa.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index 73ef4d2db32..bb37ff7507d 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -17,6 +17,7 @@
#include <asm/io.h>
#include <i2c.h>
#include <nand.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "../common/tdx-common.h"
diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index c5562f6d578..de13ec49c5f 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -13,6 +13,7 @@
#include <asm/gpio.h>
#include <asm/io.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "pinmux-config-colibri_t30.h"
#include "../common/tdx-common.h"
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index e9c5bc06322..5056447761d 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <asm/arch/clock.h>
#include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index e19be067ce3..29d4972df8e 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -7,6 +7,7 @@
#include <env.h>
#include <g_dnl.h>
#include <init.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <linux/string.h>
diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h
index 81375de598c..f7d09cee525 100644
--- a/board/toradex/common/tdx-common.h
+++ b/board/toradex/common/tdx-common.h
@@ -6,6 +6,7 @@
#ifndef _TDX_COMMON_H
#define _TDX_COMMON_H
+#include <asm/u-boot.h>
#define TORADEX_USB_PRODUCT_NUM_OFFSET 0x4000
#define TDX_USB_VID 0x1B67
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 5ee86dd3f89..c593ac01cd3 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -17,6 +17,7 @@
#include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/iomux-v3.h>
#include <cpu_func.h>
+#include <asm/u-boot.h>
#include <dm/device.h>
#include <dm/device-internal.h>
#include <dm/uclass.h>
diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
index 1161b5c31d9..2fe5d407ef9 100644
--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
@@ -12,6 +12,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <micrel.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 17b4662c167..9e22d4ebcf8 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -17,6 +17,7 @@
#include <asm/mmu.h>
#include <pci.h>
#include <flash.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <mtd/cfi_flash.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 26d557cece9..d9bbbfc5e43 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -16,6 +16,7 @@
#include <env.h>
#include <fdt_support.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/gpio.h>
#include <asm/io.h>
diff --git a/board/tqc/tqma6/tqma6_bb.h b/board/tqc/tqma6/tqma6_bb.h
index b0f1f99a83c..1c5f3fc5adf 100644
--- a/board/tqc/tqma6/tqma6_bb.h
+++ b/board/tqc/tqma6/tqma6_bb.h
@@ -8,6 +8,7 @@
#define __TQMA6_BB__
#include <common.h>
+#include <asm/u-boot.h>
int tqma6_bb_board_mmc_getwp(struct mmc *mmc);
int tqma6_bb_board_mmc_getcd(struct mmc *mmc);
diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
index 801619e80b6..e50bd9ecebd 100644
--- a/board/tqc/tqma6/tqma6_mba6.c
+++ b/board/tqc/tqma6/tqma6_mba6.c
@@ -15,6 +15,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c
index 3b1bc603ce8..9a4350cce6d 100644
--- a/board/tqc/tqma6/tqma6_wru4.c
+++ b/board/tqc/tqma6/tqma6_wru4.c
@@ -17,6 +17,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index aef82e2c2df..1ae4bc33978 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -26,6 +26,7 @@
#include <asm/mach-imx/mxc_i2c.h>
#include <asm/arch/sys_proto.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <common.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index d83f23dd358..e6d441f582b 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -14,6 +14,7 @@
#include <malloc.h>
#include <asm/arch/mx6-pins.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c
index d9afbbb7419..9ef9db18cd0 100644
--- a/board/udoo/udoo_spl.c
+++ b/board/udoo/udoo_spl.c
@@ -12,6 +12,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index 1c52cfd882e..6378d44863b 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -14,6 +14,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <miiphy.h>
#include <netdev.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 725600770b7..49ff41cab0f 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -13,6 +13,7 @@
#include <asm/arch/mx6-pins.h>
#include <asm/arch/crm_regs.h>
#include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index c5d34df777d..0c8060e4d7d 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -10,6 +10,7 @@
#include <image.h>
#include <init.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <asm/mmu.h>
#include <asm/processor.h>
diff --git a/board/varisys/cyrus/cyrus.h b/board/varisys/cyrus/cyrus.h
index d8f8d6c8ec8..4aefae46ae9 100644
--- a/board/varisys/cyrus/cyrus.h
+++ b/board/varisys/cyrus/cyrus.h
@@ -3,6 +3,7 @@
#ifndef __CYRUS_H
#define __CYRUS_H
+#include <asm/u-boot.h>
void fdt_fixup_board_enet(void *blob);
void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 184948094db..2f732dd18f7 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -13,6 +13,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/varisys/cyrus/eth.c b/board/varisys/cyrus/eth.c
index bc681079e26..07e3b979c47 100644
--- a/board/varisys/cyrus/eth.c
+++ b/board/varisys/cyrus/eth.c
@@ -13,6 +13,7 @@
#include <malloc.h>
#include <fdt_support.h>
#include <fsl_dtsec.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_FMAN_ENET
diff --git a/board/varisys/cyrus/law.c b/board/varisys/cyrus/law.c
index 8b1b118b551..0391d606f9c 100644
--- a/board/varisys/cyrus/law.c
+++ b/board/varisys/cyrus/law.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_LBC0_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_LBC),
diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c
index 429c398cb44..373d15c0e27 100644
--- a/board/varisys/cyrus/pci.c
+++ b/board/varisys/cyrus/pci.c
@@ -8,6 +8,7 @@
#include <init.h>
#include <pci.h>
#include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/fsl_serdes.h>
diff --git a/board/varisys/cyrus/tlb.c b/board/varisys/cyrus/tlb.c
index b1af3e04d64..8068ec0ca1d 100644
--- a/board/varisys/cyrus/tlb.c
+++ b/board/varisys/cyrus/tlb.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 78d401e955e..dcd6d2a132e 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -12,6 +12,7 @@
#include <fdt_support.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <pci.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index ed375c58cb9..f01a78897c6 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <serial.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <spl.h>
#include <asm/arch/cpu.h>
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index 0983d100588..c61428d6c64 100644
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -11,6 +11,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/gpio.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 7d3da302395..e7e3bf6f8de 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -26,6 +26,7 @@
#include <asm/mach-imx/sata.h>
#include <asm/io.h>
#include <env.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/sizes.h>
#include <common.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index 0f1d038fabd..fbf7a5be71c 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -18,6 +18,7 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <common.h>
#include <watchdog.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 0f202241dd7..929ec65947c 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -19,6 +19,7 @@
#include <env.h>
#include <asm/arch/crm_regs.h>
#include <netdev.h>
+#include <asm/u-boot.h>
#include <power/pmic.h>
#include <power/pfuze3000_pmic.h>
#include "../freescale/common/pfuze.h"
diff --git a/board/work-microwave/work_92105/work_92105.c b/board/work-microwave/work_92105/work_92105.c
index bdcecff7308..97a7cad3833 100644
--- a/board/work-microwave/work_92105/work_92105.c
+++ b/board/work-microwave/work_92105/work_92105.c
@@ -17,6 +17,7 @@
#include <asm/arch/wdt.h>
#include <asm/gpio.h>
#include <spl.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "work_92105_display.h"
diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c
index 8ca65ca8593..abd86694f30 100644
--- a/board/xes/common/fsl_8xxx_clk.c
+++ b/board/xes/common/fsl_8xxx_clk.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
/*
* Return SYSCLK input frequency - 50 MHz or 66 MHz depending on POR config
diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c
index b26810338f8..fe6858e0d29 100644
--- a/board/xes/common/fsl_8xxx_misc.c
+++ b/board/xes/common/fsl_8xxx_misc.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_PCA953X
#include <pca953x.h>
diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
index 157aa32826a..c4aa04b41c9 100644
--- a/board/xes/common/fsl_8xxx_pci.c
+++ b/board/xes/common/fsl_8xxx_pci.c
@@ -10,6 +10,7 @@
#include <asm/fsl_pci.h>
#include <asm/fsl_serdes.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
diff --git a/board/xes/xpedite517x/ddr.c b/board/xes/xpedite517x/ddr.c
index a3fd2fc8ca8..973da7099cc 100644
--- a/board/xes/xpedite517x/ddr.c
+++ b/board/xes/xpedite517x/ddr.c
@@ -9,6 +9,7 @@
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
#include <log.h>
+#include <asm/u-boot.h>
void get_spd(ddr2_spd_eeprom_t *spd, u8 i2c_address)
{
diff --git a/board/xes/xpedite517x/law.c b/board/xes/xpedite517x/law.c
index b82f9f0d3b1..b72cdd0f2ed 100644
--- a/board/xes/xpedite517x/law.c
+++ b/board/xes/xpedite517x/law.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* Notes:
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 8a5b52c4952..333edd4cd99 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <fdt_support.h>
#include <pca953x.h>
+#include <asm/u-boot.h>
#include "../common/fsl_8xxx_misc.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xes/xpedite520x/law.c b/board/xes/xpedite520x/law.c
index 10613ead3f2..34173b1d300 100644
--- a/board/xes/xpedite520x/law.c
+++ b/board/xes/xpedite520x/law.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* Notes:
diff --git a/board/xes/xpedite520x/tlb.c b/board/xes/xpedite520x/tlb.c
index d45f532861e..3a10fdb83d5 100644
--- a/board/xes/xpedite520x/tlb.c
+++ b/board/xes/xpedite520x/tlb.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c
index 63e1e0efe54..016bd412ce8 100644
--- a/board/xes/xpedite520x/xpedite520x.c
+++ b/board/xes/xpedite520x/xpedite520x.c
@@ -14,6 +14,7 @@
#include <asm/io.h>
#include <asm/cache.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <pca953x.h>
diff --git a/board/xes/xpedite537x/ddr.c b/board/xes/xpedite537x/ddr.c
index f55102a072e..b34c190ee09 100644
--- a/board/xes/xpedite537x/ddr.c
+++ b/board/xes/xpedite537x/ddr.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <i2c.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite537x/law.c b/board/xes/xpedite537x/law.c
index a1f375900cb..c69129cdd36 100644
--- a/board/xes/xpedite537x/law.c
+++ b/board/xes/xpedite537x/law.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* Notes:
diff --git a/board/xes/xpedite537x/tlb.c b/board/xes/xpedite537x/tlb.c
index 6d50360f069..6a1db856f43 100644
--- a/board/xes/xpedite537x/tlb.c
+++ b/board/xes/xpedite537x/tlb.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c
index 437b57d4ff6..a55c7d24264 100644
--- a/board/xes/xpedite537x/xpedite537x.c
+++ b/board/xes/xpedite537x/xpedite537x.c
@@ -12,6 +12,7 @@
#include <asm/fsl_pci.h>
#include <asm/io.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <pca953x.h>
diff --git a/board/xes/xpedite550x/ddr.c b/board/xes/xpedite550x/ddr.c
index ad52c9455b8..e6fb11dfcba 100644
--- a/board/xes/xpedite550x/ddr.c
+++ b/board/xes/xpedite550x/ddr.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <i2c.h>
+#include <asm/u-boot.h>
#include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite550x/law.c b/board/xes/xpedite550x/law.c
index 1e2d604d9d4..c4de11b2980 100644
--- a/board/xes/xpedite550x/law.c
+++ b/board/xes/xpedite550x/law.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <asm/fsl_law.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
/*
* Notes:
diff --git a/board/xes/xpedite550x/tlb.c b/board/xes/xpedite550x/tlb.c
index 7cb6cd67706..3bb913b1d0a 100644
--- a/board/xes/xpedite550x/tlb.c
+++ b/board/xes/xpedite550x/tlb.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <asm/mmu.h>
+#include <asm/u-boot.h>
struct fsl_e_tlb_entry tlb_table[] = {
/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c
index 9089a0cc72a..9347b895885 100644
--- a/board/xes/xpedite550x/xpedite550x.c
+++ b/board/xes/xpedite550x/xpedite550x.c
@@ -12,6 +12,7 @@
#include <asm/fsl_pci.h>
#include <asm/io.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <pca953x.h>
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 025212b223c..962f482f585 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -17,6 +17,7 @@
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
#include <dm/device.h>
#include <dm/uclass.h>
#include <versalpl.h>
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 91446fb9c39..28eb960aa89 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <init.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/uclass.h>
#include <env.h>
#include <fdtdec.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index c43727ab87a..cad94339fc7 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -11,6 +11,7 @@
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/string.h>
#include <u-boot/md5.h>
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 3bd39d5eb47..fa06a4237f6 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -25,6 +25,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
#include <dm/device.h>
#include <dm/uclass.h>
#include <usb.h>
diff --git a/board/xilinx/zynqmp_r5/board.c b/board/xilinx/zynqmp_r5/board.c
index 5c5a2e93863..817db3d5c88 100644
--- a/board/xilinx/zynqmp_r5/board.c
+++ b/board/xilinx/zynqmp_r5/board.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <fdtdec.h>
#include <init.h>
+#include <asm/u-boot.h>
int board_init(void)
{
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index cd4a7723b12..738286f7f14 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -14,6 +14,7 @@
#include <asm/arch/mpp.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include "nsa310s.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 40079608d1a..6c346cd8b0a 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -13,6 +13,7 @@
#include <vsprintf.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/bedbug.c b/cmd/bedbug.c
index 6dc3bab74da..87296e2db05 100644
--- a/cmd/bedbug.c
+++ b/cmd/bedbug.c
@@ -8,6 +8,7 @@
#include <console.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <net.h>
#include <bedbug/type.h>
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index e9f2039cb78..636b3868aef 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -19,6 +19,7 @@
#include <log.h>
#include <malloc.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <linux/libfdt_env.h>
#include <mapmem.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 599251f7181..f72fdf21091 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -17,6 +17,7 @@
#include <nand.h>
#include <asm/byteorder.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/ctype.h>
#include <linux/err.h>
#include <linux/string.h>
diff --git a/cmd/bootz.c b/cmd/bootz.c
index 1c8b0cf89f9..6496f027c4b 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -11,6 +11,7 @@
#include <irq_func.h>
#include <lmb.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
int __weak bootz_setup(ulong image, ulong *start, ulong *end)
diff --git a/cmd/mmc.c b/cmd/mmc.c
index bc7e991c86e..ab9f4b9e8a5 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -14,6 +14,7 @@
#include <part.h>
#include <sparse_format.h>
#include <image-sparse.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
static int curr_device = -1;
diff --git a/cmd/reginfo.c b/cmd/reginfo.c
index c8a04b1754e..f7e1803445b 100644
--- a/cmd/reginfo.c
+++ b/cmd/reginfo.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <command.h>
#include <asm/ppc.h>
+#include <asm/u-boot.h>
static int do_reginfo(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
diff --git a/cmd/spl.c b/cmd/spl.c
index 472703f8fe1..42e7eb2e309 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -11,6 +11,7 @@
#include <image.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index 949f8774c83..362c81521c8 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -53,6 +53,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/sections.h>
+#include <asm/u-boot.h>
#include <dm/root.h>
#include <linux/errno.h>
#include <linux/string.h>
diff --git a/common/board_r.c b/common/board_r.c
index 714a9137aba..20534a31881 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -23,6 +23,7 @@
#include <net.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <u-boot/crc.h>
/* TODO: can we just include all these headers whether needed or not? */
#if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm.c b/common/bootm.c
index f9ff1ce78ba..8a1ea66cff0 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -23,6 +23,7 @@
#if defined(CONFIG_CMD_USB)
#include <usb.h>
#endif
+#include <asm/u-boot.h>
#include <linux/string.h>
#else
#include "mkimage.h"
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 295c6b8c064..9c78bba8e61 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -15,6 +15,7 @@
#include <lmb.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <malloc.h>
#include <mapmem.h>
diff --git a/common/image.c b/common/image.c
index ab0f0439bad..e183a9cefa0 100644
--- a/common/image.c
+++ b/common/image.c
@@ -16,6 +16,7 @@
#include <log.h>
#include <malloc.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <u-boot/crc.h>
#include <watchdog.h>
diff --git a/common/init/handoff.c b/common/init/handoff.c
index 0e7470ad78e..0b8ac0d4d74 100644
--- a/common/init/handoff.c
+++ b/common/init/handoff.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <handoff.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index d2f802aff86..8d107602022 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -14,6 +14,7 @@
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
#include <malloc.h>
#include <libata.h>
#include <fis.h>
diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c
index 8cc30cf40ef..a34d154b310 100644
--- a/drivers/bootcount/bootcount_ram.c
+++ b/drivers/bootcount/bootcount_ram.c
@@ -9,6 +9,7 @@
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index 5f1592f9ad4..6929b6cf45b 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -11,6 +11,7 @@
#include <dm.h>
#include <log.h>
#include <vsprintf.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include "mpc83xx_cpu.h"
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index d554df87eba..1ddc35d5d3b 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -14,6 +14,7 @@
#include <ram.h>
#include <reset.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "sdram_soc64.h"
#include <wait_bit.h>
#include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 6235bd959fe..71c68d3e7a8 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -16,6 +16,7 @@
#include <ram.h>
#include <reset.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include "sdram_s10.h"
#include <wait_bit.h>
#include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 1312244ae52..5729588a074 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -17,6 +17,7 @@
#include <reset.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "sdram_soc64.h"
#include <wait_bit.h>
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index 629ba6784e0..ca241ee5fff 100644
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -13,6 +13,7 @@
#include <fsl_immap.h>
#include <fsl_ddr.h>
#include <asm/arch/clock.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 247587c646b..1edd39b9b73 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -22,6 +22,7 @@
defined(CONFIG_ARM)
#include <asm/arch/clock.h>
#endif
+#include <asm/u-boot.h>
#include <linux/string.h>
/*
diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index e43c6801546..c0a9540f420 100644
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -16,6 +16,7 @@
defined(CONFIG_ARM)
#include <asm/arch/clock.h>
#endif
+#include <asm/u-boot.h>
#include <linux/delay.h>
#define CTLR_INTLV_MASK 0x20000000
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 572f3703d51..467775d2be9 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -7,6 +7,7 @@
#include <log.h>
#include <asm/io.h>
#include <fsl_ddr_sdram.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index d7b8064e5f1..14af7ca4a78 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -7,6 +7,7 @@
#include <asm/io.h>
#include <asm/processor.h>
#include <fsl_ddr_sdram.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index 1ed4d50cc74..3c18d441ed1 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -8,6 +8,7 @@
#include <asm/io.h>
#include <fsl_ddr_sdram.h>
#include <asm/processor.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index c000a45f8ea..fce4fb66334 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -9,6 +9,7 @@
#include <hwconfig.h>
#include <fsl_ddr_sdram.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <fsl_ddr.h>
#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index ac4f8d2732d..2386667f3a0 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -8,6 +8,7 @@
#include <asm/fsl_law.h>
#endif
#include <div64.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <fsl_ddr.h>
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index b7eddf0f04c..a9d28779ebd 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -12,6 +12,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/fsl_dma.h>
+#include <asm/u-boot.h>
/* Controller can only transfer 2^26 - 1 bytes at a time */
#define FSL_DMA_MAX_SIZE (0x3ffffff)
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 9f4a936ecb6..22b04143d17 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -11,6 +11,7 @@
#include <dm.h>
#include <irq_func.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <dm/lists.h>
#include <efi_loader.h>
#include <linux/delay.h>
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index c2000104b51..9be7587261c 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -17,6 +17,7 @@
#include <clk.h>
#include <dm.h>
#include <mapmem.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index b484cebfb4e..b490a99abce 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -16,6 +16,7 @@
#include <log.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index 8fdaacd5e04..d0b189c4db3 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <fsl_ifc.h>
#include <part.h>
+#include <asm/u-boot.h>
#ifdef CONFIG_TFABOOT
struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 2c8cec7c421..deaebb2eb23 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <linux/string.h>
diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c
index 321bd27fd32..12c610f1dc9 100644
--- a/drivers/misc/fsl_sec_mon.c
+++ b/drivers/misc/fsl_sec_mon.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <fsl_sec_mon.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
static u32 get_sec_mon_state(void)
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 9b2fe0653c6..50731f3fe7b 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -16,6 +16,7 @@
#include <asm/io.h>
#include <asm/arch/sdmmc_defs.h>
#include <asm-generic/gpio.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index ce7cfb5930e..3f8d4228150 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -17,6 +17,7 @@
#include <time.h>
#include <wait_bit.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <power/regulator.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 058ba827940..d18a8d0a314 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -25,6 +25,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <dm/device_compat.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 29292147bcb..f0eb7c88805 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -23,6 +23,7 @@
#include <time.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/device_compat.h>
#include <linux/bitops.h>
#include <linux/delay.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e8c2360f976..e9c181555d0 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -14,6 +14,7 @@
#include <dm.h>
#include <log.h>
#include <time.h>
+#include <asm/u-boot.h>
#include <dm/device-internal.h>
#include <errno.h>
#include <mmc.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 8101f6bcc27..b33cd40faee 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -19,6 +19,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
#include <mvebu_mmc.h>
+#include <asm/u-boot.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 5ca4a5140e1..00720c64084 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -24,6 +24,7 @@
#include <malloc.h>
#include <mmc.h>
#include <time.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 5bb12b612e3..4df872cc3ec 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -24,6 +24,7 @@
#include <log.h>
#include <malloc.h>
#include <mmc.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index c406963d757..79ac5a8d170 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -13,6 +13,7 @@
#include <mtd.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/string.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 21cdf62478a..9d4f5437b1f 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -31,6 +31,7 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/byteorder.h>
+#include <asm/u-boot.h>
#include <asm/unaligned.h>
#include <env_internal.h>
#include <linux/delay.h>
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 4f3c3223ca7..9c758172c11 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -60,6 +60,7 @@
#include <common.h>
#include <log.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include <dm/devres.h>
#include <linux/bug.h>
#include <linux/compat.h>
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 026280e5e62..a698961597f 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -16,6 +16,7 @@
#include <common.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/compat.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/onenand.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index f15228741ff..7ac45b97b9f 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -13,6 +13,7 @@
#include <asm/io.h>
#include <clk.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <dm/device_compat.h>
#include <dm/of_access.h>
#include <errno.h>
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 7171479c80d..518ba44da33 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -18,6 +18,7 @@
#include <time.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/compiler.h>
#include <linux/delay.h>
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 2dbd2d870b3..375f1b13999 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -17,6 +17,7 @@
#include <netdev.h>
#include <asm/types.h>
#include <asm/byteorder.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/mii.h>
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index b6282938788..62263cb435a 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -18,6 +18,7 @@
#include <netdev.h>
#include <malloc.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <linux/string.h>
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index a679b6529ff..b971c16a654 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -42,6 +42,7 @@
#include <log.h>
#include <net.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <linux/string.h>
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 7ffdd87449a..2e864208633 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -8,6 +8,7 @@
#include <malloc.h>
#include <net.h>
#include <config.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 75b519ccfd1..ff8131fafc2 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <malloc.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/delay.h>
#include <linux/err.h>
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 8eacba7083c..fea6ad77d0a 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -7,6 +7,7 @@
#include <net.h>
#include <netdev.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 490db2b69fc..f325bf23731 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -21,6 +21,7 @@
#include <reset.h>
#include <time.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <dm/device_compat.h>
#include <dm/devres.h>
#include <linux/compiler.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 9860830da09..928c6d85856 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -55,6 +55,7 @@ TODO: external MII is not functional, only internal at the moment.
#include <time.h>
#include <asm/io.h>
#include <dm9000.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 888a9990efe..4efb8199dfb 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index cf2c56cd123..9613af44422 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -39,6 +39,7 @@ tested on both gig copper and gig fiber boards
#include <memalign.h>
#include <net.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "e1000.h"
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 392d44f89d7..9ff078176b8 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -12,6 +12,7 @@
#include <net.h>
#include <netdev.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index a72d9c2471d..72ad7936d63 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -24,6 +24,7 @@
#include <asm/io.h>
#include <malloc.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/bug.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 7c56b7242d4..f158c7625bd 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -14,6 +14,7 @@
#include <dm.h>
#include <log.h>
#include <time.h>
+#include <asm/u-boot.h>
#include <dm/platform_data/net_ethoc.h>
#include <linux/io.h>
#include <malloc.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index eef443f5f63..1d8bdb9e12f 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -20,6 +20,7 @@
#include <time.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <power/regulator.h>
diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h
index 5ccde9193b2..20e1712a077 100644
--- a/drivers/net/fec_mxc.h
+++ b/drivers/net/fec_mxc.h
@@ -17,6 +17,7 @@
#define __FEC_MXC_H
#include <clk.h>
+#include <asm/u-boot.h>
/* Layout description of the FEC */
struct ethernet_regs {
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 252f9678799..358643c70fb 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -24,6 +24,7 @@
#include <fsl_dtsec.h>
#include <fsl_tgec.h>
#include <fsl_memac.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 8f1a45b3a22..b779b5c2299 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -14,6 +14,7 @@
#else
#include <asm/fsl_serdes.h>
#endif
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "fm.h"
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 53e0760833c..72246192b3c 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -11,6 +11,7 @@
#include <asm/io.h>
#include <fsl_memac.h>
#include <fm_eth.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index ad6c08e431c..39044418796 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -10,6 +10,7 @@
#include <asm/io.h>
#include <fsl_tgec.h>
#include <fm_eth.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
/*
diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h
index 53f1300eaf8..59b83487cf8 100644
--- a/drivers/net/fsl-mc/dpio/qbman_private.h
+++ b/drivers/net/fsl-mc/dpio/qbman_private.h
@@ -7,6 +7,7 @@
#include <common.h>
#include <errno.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/bug.h>
#include <linux/types.h>
#include <asm/atomic.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index e088d1fc12d..1ce12ae5db9 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <malloc.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bug.h>
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 62f9d00ece3..1c2449d18f4 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -19,6 +19,7 @@
#include <net.h>
#include <miiphy.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <asm/immap.h>
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index 5f692a27f23..a06b7201335 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -10,6 +10,7 @@
#include <phy.h>
#include <fsl_mdio.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/string.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index c61d13aa21f..763e0f72318 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -14,6 +14,7 @@
#include <net.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/string.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index f186148b619..449bb987355 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -13,6 +13,7 @@
#include <net.h>
#include <time.h>
#include <asm/cache.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index d22668446da..be4da897b8d 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#include <net.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "ks8851_mll.h"
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 524e9455ccf..bcaa18747f4 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -49,6 +49,7 @@
#include <env.h>
#include <malloc.h>
#include <time.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "lan91c96.h"
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index d5384b216ab..c4befd9028b 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -16,6 +16,7 @@
#include <hwconfig.h>
#include <phy.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/bug.h>
#include <linux/compat.h>
#include <fsl-mc/fsl_dpmac.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index b059accf524..4b4b09b5438 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -12,6 +12,7 @@
#include <malloc.h>
#include <miiphy.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/types.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 26939c6fa46..ec8817799da 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 2d307b23afb..d5bead5e2ce 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -20,6 +20,7 @@
#include <asm/fec.h>
#include <asm/global_data.h>
#include <asm/immap.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <linux/string.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index b6f805683e2..9cf1f5cba9f 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -13,6 +13,7 @@
#include <asm/cpm_8xx.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 5ceb37324f3..54febc7ce42 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -20,6 +20,7 @@
#include <wait_bit.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/types.h>
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index e44787d33ba..5f81d22bf0e 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -56,6 +56,7 @@
#include <netdev.h>
#include <asm/io.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 2fad4671220..409c41a179b 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -79,6 +79,7 @@ Add SNMP
#include <net.h>
#include <malloc.h>
#include <time.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/string.h>
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index 7192156a698..7ae60e8a3e7 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -57,6 +57,7 @@
#include <netdev.h>
#include <asm/io.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 1f5cca71835..b1c0a8badd1 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -18,6 +18,7 @@
#include <asm/cache.h>
#include <asm/io.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 573ceabcf7e..d2d23858961 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -6,6 +6,7 @@
#include <log.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 1229e94185c..f52fa66a4eb 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -77,6 +77,7 @@
#include <netdev.h>
#include <asm/io.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 9157dd1e351..683e5d5d9e9 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -54,6 +54,7 @@
#include <asm/cache.h>
#include <asm/io.h>
#include <pci.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/printk.h>
#include <linux/string.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 8f2fe1515e6..5ea0adb6b10 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -19,6 +19,7 @@
#include <miiphy.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/io.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 3ae55a1db7d..a341bca51cf 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -52,6 +52,7 @@
#include <config.h>
#include <malloc.h>
#include <time.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
#include "smc91111.h"
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 0ac1e3fb3d7..6f352165117 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <net.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/io.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 044a74776c3..921d5639426 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -15,6 +15,7 @@
#include <net.h>
#include <netdev.h>
#include <cpsw.h>
+#include <asm/u-boot.h>
#include <dm/device_compat.h>
#include <linux/bitops.h>
#include <linux/compiler.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index b7623bf85b1..5ab450cf8a4 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -15,6 +15,7 @@
#include <command.h>
#include <tsec.h>
#include <fsl_mdio.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 3784f72b87e..d6bc29c0c10 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -16,6 +16,7 @@
#include <asm/io.h>
#include <pci.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index 29f26b4b332..a4c701e86a3 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -17,6 +17,7 @@
#include <malloc.h>
#include <vsc9953.h>
#include <ethsw.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
static struct vsc9953_info vsc9953_l2sw = {
diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
index a52064341e0..6355daee5e1 100644
--- a/drivers/pci/pci-emul-uclass.c
+++ b/drivers/pci/pci-emul-uclass.c
@@ -8,6 +8,7 @@
#include <dm.h>
#include <fdtdec.h>
#include <log.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <pci.h>
#include <dm/lists.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index b40765a3894..7b039c98243 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -13,6 +13,7 @@
#include <pci.h>
#include <asm/global_data.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
index 3c7c4ca18e8..9369457b8e7 100644
--- a/drivers/pci/pcie_layerscape.c
+++ b/drivers/pci/pcie_layerscape.c
@@ -15,6 +15,7 @@
defined(CONFIG_ARM)
#include <asm/arch/clock.h>
#endif
+#include <asm/u-boot.h>
#include "pcie_layerscape.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index 6de93fac997..c029b1ef735 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <dm/devres.h>
#include <errno.h>
#include <pci_ep.h>
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index 94de4edaf4f..d056294d649 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -18,6 +18,7 @@
#ifdef CONFIG_ARM
#include <asm/arch/clock.h>
#endif
+#include <asm/u-boot.h>
#include "pcie_layerscape.h"
#include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index bba410e386f..b1a7578ec43 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -11,6 +11,7 @@
#include <init.h>
#include <asm/arch/clock.h>
#include <asm/arch/soc.h>
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <linux/string.h>
#include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_fixup_common.h b/drivers/pci/pcie_layerscape_fixup_common.h
index 70bd3f0cba3..0d9504fe672 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.h
+++ b/drivers/pci/pcie_layerscape_fixup_common.h
@@ -10,6 +10,7 @@
#define _PCIE_LAYERSCAPE_FIXUP_COMMON_H_
#include <common.h>
+#include <asm/u-boot.h>
void ft_pci_setup_ls(void *blob, struct bd_info *bd);
diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index 375ce45839b..b061388a22b 100644
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -19,6 +19,7 @@
#ifdef CONFIG_ARM
#include <asm/arch/clock.h>
#endif
+#include <asm/u-boot.h>
#include "pcie_layerscape_gen4.h"
#include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 7ae5b48bb92..1c5d73c0f75 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -12,6 +12,7 @@
#include <errno.h>
#include <malloc.h>
#include <dm.h>
+#include <asm/u-boot.h>
#include <dm/devres.h>
#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
defined(CONFIG_ARM)
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 409d806dd8f..3d2a37466a5 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <net.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/io.h>
diff --git a/drivers/rtc/ds174x.c b/drivers/rtc/ds174x.c
index 94f943d97a5..a7bd3e02509 100644
--- a/drivers/rtc/ds174x.c
+++ b/drivers/rtc/ds174x.c
@@ -15,6 +15,7 @@
#include <common.h>
#include <command.h>
#include <rtc.h>
+#include <asm/u-boot.h>
static uchar rtc_read( unsigned int addr );
static void rtc_write( unsigned int addr, uchar val);
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index b98c39d8219..5ef086d6006 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -12,6 +12,7 @@
#include <command.h>
#include <dm.h>
#include <rtc.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_X86) || defined(CONFIG_MALTA)
#include <asm/io.h>
diff --git a/drivers/rtc/mk48t59.c b/drivers/rtc/mk48t59.c
index 8c90a704076..0fa155c14d0 100644
--- a/drivers/rtc/mk48t59.c
+++ b/drivers/rtc/mk48t59.c
@@ -15,6 +15,7 @@
#include <config.h>
#include <rtc.h>
#include <mk48t59.h>
+#include <asm/u-boot.h>
#if defined(CONFIG_BAB7xx)
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 35f8a58da16..cf79947cb44 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index cb90266ab0c..5d14a01ca74 100644
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -10,6 +10,7 @@
#include <sysreset.h>
#include <asm/state.h>
#include <asm/test.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
static int sandbox_warm_sysreset_request(struct udevice *dev,
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 51ad79aa6eb..becaadee7d6 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -16,6 +16,7 @@
#include <watchdog.h>
#include <asm/global_data.h>
#include <asm/ptrace.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index b4c40fe1c2d..94ebd8ad54e 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -20,6 +20,7 @@
#include <asm/ibmpc.h>
#include <asm/msr.h>
#include <asm/u-boot-x86.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#define MAX_NUM_FREQS 9
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 5fc887c7cf7..bda8885d7cd 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -15,6 +15,7 @@
#include <fsl_errata.h>
#include <fsl_usb.h>
#include <fdt_support.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index 9eb1d230672..297a05baf3e 100644
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <hwconfig.h>
#include <fsl_errata.h>
+#include <asm/u-boot.h>
#include<fsl_usb.h>
#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
defined(CONFIG_ARM)
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index 3a0d8dadb35..c649813600b 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -12,6 +12,7 @@
#include <usb.h>
#include <malloc.h>
#include <memalign.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <linux/string.h>
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index b4249d9ad51..f26b47dcb6a 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -10,6 +10,7 @@
#include <log.h>
#include <usb.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <linux/string.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 5cdd7a10e7c..c9bbc4035c1 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -14,6 +14,7 @@
#include <errno.h>
#include <log.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <malloc.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 40947150a0b..0f37a5aaea5 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -12,6 +12,7 @@
#include <memalign.h>
#include <net.h>
#include <usb.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <linux/bitops.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 5d8e93c2337..f12e67bf238 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -15,6 +15,7 @@
#include <net.h>
#include <time.h>
#include <usb.h>
+#include <asm/u-boot.h>
#include <asm/unaligned.h>
#include <linux/delay.h>
#include <linux/mii.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index f12b07fd1ab..f58bd60a8cb 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -13,6 +13,7 @@
#include <log.h>
#include <part.h>
#include <time.h>
+#include <asm/u-boot.h>
#include <linux/errno.h>
#include <linux/netdevice.h>
#include <linux/printk.h>
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 9f6b8a2ae5f..440280f722e 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -10,6 +10,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <usb.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include "ehci.h"
#include <linux/mbus.h>
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index f9e3c1ac43e..bc1e999b761 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -75,6 +75,7 @@
#include <malloc.h>
#include <video.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/compiler.h>
#include <linux/string.h>
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index bfa4ed3129b..1d3d26c3e89 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -14,6 +14,7 @@
#include <dm.h>
#include <fdt_support.h>
#include <fsl_dcu_fb.h>
+#include <asm/u-boot.h>
#include <linux/fb.h>
#include <malloc.h>
#include <video.h>
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index e90e23779d7..5fd6a8084d5 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <malloc.h>
#include <asm/io.h>
+#include <asm/u-boot.h>
#include <linux/string.h>
#include "videomodes.h"
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 2d095c6a28e..b34e5df5630 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -14,6 +14,7 @@
#include <log.h>
#include <part.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/sizes.h>
#include <asm/arch/mem.h>
#include <dm/device-internal.h>
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index 6e3999649d3..8529504014e 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -19,6 +19,7 @@
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/display2.h>
+#include <asm/u-boot.h>
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
#include <linux/bitops.h>
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index d1330314621..1967a2a1f6c 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -11,6 +11,7 @@
#include <efi_loader.h>
#include <init.h>
#include <time.h>
+#include <asm/u-boot.h>
#include <linux/delay.h>
#include <linux/string.h>
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index d4a4e2215dc..7a6b90d7da0 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -22,6 +22,7 @@
#ifndef __ASSEMBLY__
#include <fdtdec.h>
#include <membuff.h>
+#include <asm/u-boot.h>
#include <linux/list.h>
typedef struct global_data {
diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index 62e61d41cc9..3d4f2247e2c 100644
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -24,6 +24,7 @@
#ifndef __ASSEMBLY__
#include <asm/types.h>
+#include <asm/u-boot.h>
#include <linux/types.h>
struct bd_info {
diff --git a/include/button.h b/include/button.h
index 688b63b082c..ee14fadf0cf 100644
--- a/include/button.h
+++ b/include/button.h
@@ -6,6 +6,8 @@
#ifndef __BUTTON_H
#define __BUTTON_H
+struct udevice;
+
/**
* struct button_uc_plat - Platform data the uclass stores about each device
*
diff --git a/include/clock_legacy.h b/include/clock_legacy.h
index b0a8333ea6e..7c9a66adf33 100644
--- a/include/clock_legacy.h
+++ b/include/clock_legacy.h
@@ -7,6 +7,7 @@
#ifndef __CLOCK_LEGACY_H
#define __CLOCK_LEGACY_H
+#include <asm/u-boot.h>
int get_clocks(void);
unsigned long get_bus_freq(unsigned long dummy);
int get_serial_clock(void);
diff --git a/include/common.h b/include/common.h
index 69fa1932483..6407748e53d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -19,7 +19,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <linux/kernel.h>
-#include <asm/u-boot.h> /* boot information for Linux kernel */
#include <vsprintf.h>
#endif /* __ASSEMBLY__ */
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 760b392bdfb..138c1e9b590 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -14,6 +14,7 @@
* changes to support FDT are minimized.
*/
+#include <asm/u-boot.h>
#include <linux/libfdt.h>
#include <pci.h>
diff --git a/include/fm_eth.h b/include/fm_eth.h
index 44da014c66c..0a6000137b1 100644
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -10,6 +10,7 @@
#include <common.h>
#include <phy.h>
#include <asm/types.h>
+#include <asm/u-boot.h>
enum fm_port {
FM1_DTSEC1,
diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h
index a8b072ad7c1..732b4953b5d 100644
--- a/include/fsl-mc/fsl_mc.h
+++ b/include/fsl-mc/fsl_mc.h
@@ -7,6 +7,7 @@
#define __FSL_MC_H__
#include <common.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#define MC_CCSR_BASE_ADDR \
diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h
index 56c9db2594c..43face5c435 100644
--- a/include/fsl_ddr_sdram.h
+++ b/include/fsl_ddr_sdram.h
@@ -12,6 +12,7 @@
*/
#include <ddr_spd.h>
#include <fsl_ddrc_version.h>
+#include <asm/u-boot.h>
#define SDRAM_TYPE_DDR1 2
#define SDRAM_TYPE_DDR2 3
diff --git a/include/fsl_errata.h b/include/fsl_errata.h
index 88f4268658a..95ac2e3e10c 100644
--- a/include/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -14,6 +14,7 @@
#elif defined(CONFIG_FSL_LAYERSCAPE)
#include <asm/arch/soc.h>
#endif
+#include <asm/u-boot.h>
#ifdef CONFIG_SYS_FSL_ERRATUM_A006379
diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index 7f8f8edc621..e15d10c669d 100644
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -207,6 +207,7 @@ void fdt_fixup_esdhc(void *blob, struct bd_info *bd);
static inline int fsl_esdhc_execute_tuning(struct udevice *dev,
uint32_t opcode) {return 0; }
#endif
+#include <asm/u-boot.h>
#else
static inline int fsl_esdhc_mmc_init(struct bd_info *bis) { return -ENOSYS; }
static inline void fdt_fixup_esdhc(void *blob, struct bd_info *bd) {}
diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h
index 45ed635a77b..78f0e18dde3 100644
--- a/include/fsl_esdhc_imx.h
+++ b/include/fsl_esdhc_imx.h
@@ -12,6 +12,7 @@
#ifndef __FSL_ESDHC_IMX_H__
#define __FSL_ESDHC_IMX_H__
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/errno.h>
#include <asm/byteorder.h>
diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h
index 41cb73717bc..b8fed2a0d2c 100644
--- a/include/fsl_mdio.h
+++ b/include/fsl_mdio.h
@@ -10,6 +10,7 @@
#include <net.h>
#include <miiphy.h>
+#include <asm/u-boot.h>
struct tsec_mii_mng {
u32 miimcfg; /* MII management configuration reg */
diff --git a/include/mmc.h b/include/mmc.h
index 82562193cc4..c1562a61ea5 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -9,6 +9,7 @@
#ifndef _MMC_H_
#define _MMC_H_
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/list.h>
#include <linux/sizes.h>
diff --git a/include/mvebu_mmc.h b/include/mvebu_mmc.h
index a35e5a12ce8..790199ca5e6 100644
--- a/include/mvebu_mmc.h
+++ b/include/mvebu_mmc.h
@@ -12,6 +12,7 @@
/* needed for the mmc_cfg definition */
#include <mmc.h>
+#include <asm/u-boot.h>
#define MMC_BLOCK_SIZE 512
diff --git a/include/net.h b/include/net.h
index 26163f9f097..bf6e2f05227 100644
--- a/include/net.h
+++ b/include/net.h
@@ -12,6 +12,7 @@
#ifndef __NET_H__
#define __NET_H__
+#include <asm/u-boot.h>
#include <linux/string.h>
#include <linux/types.h>
#include <asm/cache.h>
diff --git a/include/net/pfe_eth/pfe_eth.h b/include/net/pfe_eth/pfe_eth.h
index 92dc46ee9ac..64ac9be763c 100644
--- a/include/net/pfe_eth/pfe_eth.h
+++ b/include/net/pfe_eth/pfe_eth.h
@@ -7,6 +7,7 @@
#ifndef __PFE_ETH_H__
#define __PFE_ETH_H__
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#include <linux/sizes.h>
#include <asm/io.h>
diff --git a/include/netdev.h b/include/netdev.h
index 0ad9f8dc3a5..52db3d56411 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -11,6 +11,7 @@
#ifndef _NETDEV_H_
#define _NETDEV_H_
#include <phy_interface.h>
+#include <asm/u-boot.h>
struct udevice;
diff --git a/include/post.h b/include/post.h
index eb218acde5f..cea1a53c4c1 100644
--- a/include/post.h
+++ b/include/post.h
@@ -22,16 +22,19 @@
#else
#if defined(CONFIG_ARCH_MPC8360)
+#include <asm/u-boot.h>
#include <linux/immap_qe.h>
#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR)
#elif defined (CONFIG_MPC85xx)
#include <asm/immap_85xx.h>
+#include <asm/u-boot.h>
#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_PIC_OFFSET + \
offsetof(ccsr_pic_t, tfrr))
#elif defined (CONFIG_MPC86xx)
#include <asm/immap_86xx.h>
+#include <asm/u-boot.h>
#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC86xx_PIC_OFFSET + \
offsetof(ccsr_pic_t, tfrr))
#endif
diff --git a/include/tsec.h b/include/tsec.h
index 43255e538f7..630c30b6396 100644
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -16,6 +16,7 @@
#include <net.h>
#include <config.h>
#include <phy.h>
+#include <asm/u-boot.h>
#define TSEC_MDIO_REGS_OFFSET 0x520
diff --git a/include/vsc9953.h b/include/vsc9953.h
index a9c84b4b50c..604214ee32d 100644
--- a/include/vsc9953.h
+++ b/include/vsc9953.h
@@ -11,6 +11,7 @@
#include <config.h>
#include <miiphy.h>
#include <asm/types.h>
+#include <asm/u-boot.h>
#include <linux/bitops.h>
#define VSC9953_OFFSET (CONFIG_SYS_CCSRBAR_DEFAULT + 0x800000)
diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index ee592cfda1c..e4fb52e8760 100644
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -14,6 +14,7 @@
#include <common.h>
#include <asm-offsets.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/kbuild.h>
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index b39ca817dde..8f264532f62 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -13,6 +13,7 @@
#include <malloc.h>
#include <time.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/libfdt_env.h>
#include <linux/string.h>
#include <u-boot/crc.h>
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 9e0e08bc7a9..7041bd6ed2b 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -13,6 +13,7 @@
#include <watchdog.h>
#include <asm/cache.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/list_sort.h>
#include <linux/sizes.h>
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 37bacdd7b33..e938ea5ea30 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -13,6 +13,7 @@
#include <log.h>
#include <malloc.h>
#include <net.h>
+#include <asm/u-boot.h>
#include <dm/of_extra.h>
#include <env.h>
#include <errno.h>
diff --git a/lib/lmb.c b/lib/lmb.c
index 2d680d8d02f..61a0bdb1e1a 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -11,6 +11,7 @@
#include <lmb.h>
#include <log.h>
#include <malloc.h>
+#include <asm/u-boot.h>
#define LMB_ALLOC_ANYWHERE 0
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 6e6a3b5e8dd..1c9afd75f36 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -13,6 +13,7 @@
#include <net.h>
#include <phy.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
#include <linux/bug.h>
#include <linux/errno.h>
#include <linux/string.h>
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index cc971a89097..37a1a576a80 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -16,6 +16,7 @@
#include <watchdog.h>
#include <asm/io.h>
#include <post.h>
+#include <asm/u-boot.h>
#if CONFIG_POST & CONFIG_SYS_POST_ECC
/*
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index 281989da6fa..05dbfc144c8 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <log.h>
#include <asm/global_data.h>
+#include <asm/u-boot.h>
/* Memory test
*
diff --git a/test/dm/pci.c b/test/dm/pci.c
index 39e82b3699f..41b7adb62ea 100644
--- a/test/dm/pci.c
+++ b/test/dm/pci.c
@@ -7,6 +7,7 @@
#include <dm.h>
#include <asm/io.h>
#include <asm/test.h>
+#include <asm/u-boot.h>
#include <dm/test.h>
#include <test/ut.h>
--
2.28.0.163.g6104cc2f0b6-goog
More information about the U-Boot
mailing list