From ca123f0a600e1ca8dab61f1e39001ccd6d3bb6ab Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 5 Mar 2018 01:20:11 +0900 Subject: [PATCH] libfdt: move headers to and Thomas reported U-Boot failed to build host tools if libfdt-devel package is installed because tools include libfdt headers from /usr/include/ instead of using internal ones. This commit moves the header code: include/libfdt.h -> include/linux/libfdt.h include/libfdt_env.h -> include/linux/libfdt_env.h and replaces include directives: #include -> #include #include -> #include Reported-by: Thomas Petazzoni Signed-off-by: Masahiro Yamada (cherry picked from commit b08c8c4870831c9315dcae237772238e80035bd5) backport to 2016.11 Signed-off-by: Max Krummenacher --- arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- arch/arm/cpu/armv7/omap5/fdt.c | 2 +- arch/arm/cpu/armv7/virt-dt.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +- arch/arm/cpu/armv8/spin_table.c | 2 +- arch/arm/lib/bootm.c | 2 +- arch/arm/lib/psci-dt.c | 2 +- arch/arm/mach-meson/board.c | 2 +- arch/arm/mach-mvebu/arm64-common.c | 2 +- arch/arm/mach-mvebu/armada3700/cpu.c | 2 +- arch/arm/mach-mvebu/armada8k/cpu.c | 2 +- arch/arm/mach-socfpga/misc.c | 2 +- arch/arm/mach-uniphier/board_init.c | 2 +- arch/arm/mach-uniphier/board_late_init.c | 2 +- arch/arm/mach-uniphier/boards.c | 2 +- arch/arm/mach-uniphier/dram_init.c | 2 +- arch/nios2/cpu/fdt.c | 2 +- arch/powerpc/cpu/mpc512x/pci.c | 2 +- arch/powerpc/cpu/mpc5xxx/cpu.c | 2 +- arch/powerpc/cpu/mpc8260/cpu.c | 2 +- arch/powerpc/cpu/mpc8260/pci.c | 2 +- arch/powerpc/cpu/mpc83xx/cpu.c | 2 +- arch/powerpc/cpu/mpc83xx/fdt.c | 2 +- arch/powerpc/cpu/mpc83xx/pci.c | 2 +- arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- arch/powerpc/cpu/mpc85xx/liodn.c | 2 +- arch/powerpc/cpu/mpc85xx/portals.c | 2 +- arch/powerpc/cpu/mpc86xx/fdt.c | 2 +- arch/powerpc/cpu/mpc8xx/cpu.c | 2 +- arch/powerpc/cpu/mpc8xx/fdt.c | 2 +- arch/powerpc/cpu/mpc8xxx/fdt.c | 2 +- arch/powerpc/cpu/ppc4xx/fdt.c | 2 +- arch/powerpc/lib/bootm.c | 2 +- arch/sandbox/cpu/cpu.c | 2 +- arch/x86/cpu/intel_common/microcode.c | 2 +- board/Arcturus/ucp1020/ucp1020.c | 2 +- board/a4m072/a4m072.c | 2 +- board/amcc/canyonlands/canyonlands.c | 2 +- board/amcc/katmai/katmai.c | 2 +- board/amcc/kilauea/kilauea.c | 2 +- board/amcc/makalu/makalu.c | 2 +- board/amcc/sequoia/sequoia.c | 2 +- board/amcc/yosemite/yosemite.c | 2 +- board/armltd/vexpress/vexpress_tc2.c | 2 +- board/cm5200/cm5200.c | 2 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 2 +- board/el/el6x/el6x.c | 2 +- board/engicam/icorem6/icorem6.c | 2 +- board/esd/cpci405/cpci405.c | 2 +- board/esd/pmc405de/pmc405de.c | 2 +- board/esd/pmc440/pmc440.c | 2 +- board/esd/vme8349/vme8349.c | 2 +- board/freescale/b4860qds/pci.c | 2 +- board/freescale/bsc9131rdb/bsc9131rdb.c | 2 +- board/freescale/bsc9132qds/bsc9132qds.c | 2 +- board/freescale/c29xpcie/c29xpcie.c | 2 +- board/freescale/common/cds_pci_ft.c | 2 +- board/freescale/common/fman.c | 4 ++-- board/freescale/common/p_corenet/pci.c | 2 +- board/freescale/common/sgmii_riser.c | 2 +- board/freescale/ls1043aqds/eth.c | 2 +- board/freescale/ls2080a/ls2080a.c | 2 +- board/freescale/ls2080aqds/ls2080aqds.c | 2 +- board/freescale/ls2080ardb/ls2080ardb.c | 2 +- board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +- board/freescale/mpc8313erdb/mpc8313erdb.c | 2 +- board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +- board/freescale/mpc8323erdb/mpc8323erdb.c | 2 +- board/freescale/mpc832xemds/mpc832xemds.c | 2 +- board/freescale/mpc8349emds/mpc8349emds.c | 2 +- board/freescale/mpc8349itx/mpc8349itx.c | 2 +- board/freescale/mpc837xemds/mpc837xemds.c | 2 +- board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/mpc8540ads/mpc8540ads.c | 2 +- board/freescale/mpc8541cds/mpc8541cds.c | 2 +- board/freescale/mpc8544ds/mpc8544ds.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/mpc8555cds/mpc8555cds.c | 2 +- board/freescale/mpc8560ads/mpc8560ads.c | 2 +- board/freescale/mpc8568mds/mpc8568mds.c | 2 +- board/freescale/mpc8569mds/mpc8569mds.c | 2 +- board/freescale/mpc8572ds/mpc8572ds.c | 2 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/freescale/mx6sabresd/mx6sabresd.c | 2 +- board/freescale/mx6slevk/mx6slevk.c | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1022ds/p1022ds.c | 2 +- board/freescale/p1023rdb/p1023rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- board/freescale/p1_twr/p1_twr.c | 2 +- board/freescale/qemu-ppce500/qemu-ppce500.c | 2 +- board/freescale/t102xqds/pci.c | 2 +- board/freescale/t102xrdb/pci.c | 2 +- board/freescale/t1040qds/pci.c | 2 +- board/freescale/t104xrdb/pci.c | 2 +- board/freescale/t208xqds/pci.c | 2 +- board/freescale/t208xrdb/pci.c | 2 +- board/freescale/t4qds/pci.c | 2 +- board/freescale/t4rdb/pci.c | 2 +- board/gdsys/405ex/io64.c | 2 +- board/gdsys/intip/intip.c | 2 +- board/gdsys/mpc8308/hrcon.c | 2 +- board/gdsys/mpc8308/strider.c | 2 +- board/gdsys/p1022/controlcenterd.c | 2 +- board/ids/ids8313/ids8313.c | 2 +- board/ifm/o2dnt2/o2dnt2.c | 2 +- board/intercontrol/digsy_mtc/digsy_mtc.c | 2 +- board/ipek01/ipek01.c | 2 +- board/jupiter/jupiter.c | 2 +- board/keymile/km82xx/km82xx.c | 2 +- board/keymile/km83xx/km83xx.c | 2 +- board/keymile/kmp204x/pci.c | 2 +- board/mosaixtech/icon/icon.c | 2 +- board/motionpro/motionpro.c | 2 +- board/mpc8308_p1m/mpc8308_p1m.c | 2 +- board/phytec/pcm058/pcm058.c | 2 +- board/sbc8349/sbc8349.c | 2 +- board/sbc8548/sbc8548.c | 2 +- board/sbc8641d/sbc8641d.c | 2 +- board/socrates/socrates.c | 2 +- board/sunxi/board.c | 2 +- board/t3corp/t3corp.c | 2 +- board/toradex/apalis_imx6/apalis_imx6.c | 2 +- board/toradex/colibri_imx6/colibri_imx6.c | 4 ++-- board/toradex/common/tdx-common.c | 2 +- board/tqc/tqm5200/tqm5200.c | 2 +- board/tqc/tqm8xx/tqm8xx.c | 2 +- board/tqc/tqma6/tqma6.c | 2 +- board/tqc/tqma6/tqma6_mba6.c | 2 +- board/tqc/tqma6/tqma6_wru4.c | 2 +- board/varisys/cyrus/pci.c | 2 +- board/ve8313/ve8313.c | 2 +- board/vscom/baltos/board.c | 2 +- board/xes/common/fsl_8xxx_pci.c | 2 +- board/xes/xpedite520x/xpedite520x.c | 2 +- board/xes/xpedite537x/xpedite537x.c | 2 +- board/xes/xpedite550x/xpedite550x.c | 2 +- cmd/bootefi.c | 4 ++-- cmd/fdt.c | 2 +- common/board_info.c | 2 +- common/bootm_os.c | 2 +- common/bootstage.c | 2 +- common/fdt_support.c | 2 +- common/image-fdt.c | 2 +- common/image.c | 2 +- common/lcd_simplefb.c | 2 +- common/spl/spl_fat.c | 2 +- common/spl/spl_fit.c | 2 +- common/spl/spl_nand.c | 2 +- common/spl/spl_ymodem.c | 2 +- drivers/core/regmap.c | 2 +- drivers/core/root.c | 2 +- drivers/crypto/fsl/sec.c | 2 +- drivers/mmc/exynos_dw_mmc.c | 2 +- drivers/mmc/rockchip_sdhci.c | 2 +- drivers/mmc/s5p_sdhci.c | 2 +- drivers/mmc/socfpga_dw_mmc.c | 2 +- drivers/mmc/zynq_sdhci.c | 2 +- drivers/net/fsl-mc/mc.c | 2 +- drivers/pci/fsl_pci_init.c | 2 +- drivers/pci/pci-emul-uclass.c | 2 +- drivers/pci/pcie_layerscape.c | 2 +- drivers/pci/tsi108_pci.c | 2 +- drivers/pinctrl/pinctrl-uclass.c | 2 +- drivers/power/pmic/act8846.c | 2 +- drivers/power/pmic/rk808.c | 2 +- drivers/power/pmic/rn5t567.c | 2 +- drivers/power/regulator/pwm_regulator.c | 2 +- drivers/qe/fdt.c | 2 +- drivers/sound/sound-i2s.c | 2 +- drivers/usb/common/common.c | 2 +- drivers/usb/host/ehci-exynos.c | 2 +- drivers/usb/host/ehci-msm.c | 2 +- drivers/usb/host/ehci-tegra.c | 2 +- drivers/usb/host/ehci-vf.c | 2 +- drivers/usb/host/xhci-exynos5.c | 2 +- drivers/usb/host/xhci-rockchip.c | 2 +- drivers/usb/phy/rockchip_usb2_phy.c | 2 +- drivers/video/exynos/exynos_dp.c | 2 +- drivers/video/exynos/exynos_dp_lowlevel.c | 2 +- drivers/video/exynos/exynos_fb.c | 2 +- drivers/video/exynos/exynos_mipi_dsi.c | 2 +- include/compiler.h | 4 ++++ include/fdt_support.h | 2 +- include/fdtdec.h | 2 +- include/image.h | 2 +- include/{ => linux}/libfdt.h | 8 +++++++- include/{ => linux}/libfdt_env.h | 10 ++++++++++ lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_memory.c | 2 +- lib/fdtdec.c | 2 +- lib/fdtdec_common.c | 2 +- lib/fdtdec_test.c | 2 +- lib/libfdt/Makefile | 2 ++ lib/libfdt/fdt.c | 4 ++-- lib/libfdt/fdt_addresses.c | 4 ++-- lib/libfdt/fdt_empty_tree.c | 4 ++-- lib/libfdt/fdt_overlay.c | 6 +++--- lib/libfdt/fdt_region.c | 4 ++-- lib/libfdt/fdt_ro.c | 4 ++-- lib/libfdt/fdt_rw.c | 4 ++-- lib/libfdt/fdt_strerror.c | 4 ++-- lib/libfdt/fdt_sw.c | 4 ++-- lib/libfdt/fdt_wip.c | 4 ++-- tools/Makefile | 2 +- tools/dtoc/dtoc.py | 2 +- tools/fdt_host.h | 4 +++- tools/fdtgrep.c | 10 ++++++++-- tools/ifdtool.c | 2 +- 212 files changed, 254 insertions(+), 224 deletions(-) rename include/{ => linux}/libfdt.h (99%) rename include/{ => linux}/libfdt_env.h (78%) diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index ae5e794230..e64ac9185b 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/omap5/fdt.c b/arch/arm/cpu/armv7/omap5/fdt.c index da8d59bb59..ec869815de 100644 --- a/arch/arm/cpu/armv7/omap5/fdt.c +++ b/arch/arm/cpu/armv7/omap5/fdt.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c index 707dad4829..204187c1b4 100644 --- a/arch/arm/cpu/armv7/virt-dt.c +++ b/arch/arm/cpu/armv7/virt-dt.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 1a8321b0e4..fba0b56d24 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #ifdef CONFIG_FSL_LSCH3 diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c index ec1c9b8ddb..195901a7a7 100644 --- a/arch/arm/cpu/armv8/spin_table.c +++ b/arch/arm/cpu/armv8/spin_table.c @@ -6,7 +6,7 @@ */ #include -#include +#include #include int spin_table_update_dt(void *fdt) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 53c3141322..aa3d1c9d43 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c index baf6d7083f..1413e5ecae 100644 --- a/arch/arm/lib/psci-dt.c +++ b/arch/arm/lib/psci-dt.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c index f159cbf849..3b23610354 100644 --- a/arch/arm/mach-meson/board.c +++ b/arch/arm/mach-meson/board.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 7055a81de3..6fe6bf10e6 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c index 6499eec4ea..b9214f7bd9 100644 --- a/arch/arm/mach-mvebu/armada3700/cpu.c +++ b/arch/arm/mach-mvebu/armada3700/cpu.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c index 036430c46c..a79660f391 100644 --- a/arch/arm/mach-mvebu/armada8k/cpu.c +++ b/arch/arm/mach-mvebu/armada8k/cpu.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index dd6b53b24d..1a8e49d8af 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index 8c7864cb85..ad0973b4c9 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include "init.h" diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index ece761fb94..e2387762b7 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include <../drivers/mtd/nand/denali.h> diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c index 059645171a..0c91d2efd6 100644 --- a/arch/arm/mach-uniphier/boards.c +++ b/arch/arm/mach-uniphier/boards.c @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include "init.h" diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index 489366c63f..828f205869 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c index a44f51a7f2..8f8abfba8c 100644 --- a/arch/nios2/cpu/fdt.c +++ b/arch/nios2/cpu/fdt.c @@ -13,7 +13,7 @@ #include #ifdef CONFIG_OF_BOARD_SETUP -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc512x/pci.c b/arch/powerpc/cpu/mpc512x/pci.c index 7ea5df2960..e823c1bbce 100644 --- a/arch/powerpc/cpu/mpc512x/pci.c +++ b/arch/powerpc/cpu/mpc512x/pci.c @@ -12,7 +12,7 @@ #include #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #include #endif diff --git a/arch/powerpc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c index 84fabbd473..7b01b4efb2 100644 --- a/arch/powerpc/cpu/mpc5xxx/cpu.c +++ b/arch/powerpc/cpu/mpc5xxx/cpu.c @@ -19,7 +19,7 @@ #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #include #endif diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 9f2be3cb22..68ce80e6f1 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -33,7 +33,7 @@ #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #include #endif diff --git a/arch/powerpc/cpu/mpc8260/pci.c b/arch/powerpc/cpu/mpc8260/pci.c index 56f290ca92..2700046ce1 100644 --- a/arch/powerpc/cpu/mpc8260/pci.c +++ b/arch/powerpc/cpu/mpc8260/pci.c @@ -18,7 +18,7 @@ #include #include #ifdef CONFIG_OF_LIBFDT -#include +#include #include #endif diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index c87f0fdd29..919289b70a 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c index f249a585ed..c51eb9a010 100644 --- a/arch/powerpc/cpu/mpc83xx/fdt.c +++ b/arch/powerpc/cpu/mpc83xx/fdt.c @@ -8,7 +8,7 @@ */ #include -#include +#include #include #include diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index c7ea94cab5..bf41c69d88 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -11,7 +11,7 @@ #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #include #endif diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 047c972ac7..35a3ab3c1f 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -8,7 +8,7 @@ */ #include -#include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c index 7a4465fefc..6cfe2f6759 100644 --- a/arch/powerpc/cpu/mpc85xx/liodn.c +++ b/arch/powerpc/cpu/mpc85xx/liodn.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c index 3777c6faa1..abb12837d2 100644 --- a/arch/powerpc/cpu/mpc85xx/portals.c +++ b/arch/powerpc/cpu/mpc85xx/portals.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index 5f9ad6b0b6..0074d3ce6d 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 105be9ccc7..ca3b523967 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -28,7 +28,7 @@ #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #include #endif diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c index 97830e3c8b..3f612c9aa0 100644 --- a/arch/powerpc/cpu/mpc8xx/fdt.c +++ b/arch/powerpc/cpu/mpc8xx/fdt.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index 9cc1676b60..1f928bd136 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -8,7 +8,7 @@ */ #include -#include +#include #include #include #include diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index c73509b3ee..42fa592ca6 100644 --- a/arch/powerpc/cpu/ppc4xx/fdt.c +++ b/arch/powerpc/cpu/ppc4xx/fdt.c @@ -12,7 +12,7 @@ #include #ifdef CONFIG_OF_BOARD_SETUP -#include +#include #include #include diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index ef15e7ac92..8c47b07395 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -20,7 +20,7 @@ #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #include #endif diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index 2def72212d..938ff3d418 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -5,7 +5,7 @@ #define DEBUG #include #include -#include +#include #include #include #include diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c index eac5b781e9..8813258754 100644 --- a/arch/x86/cpu/intel_common/microcode.c +++ b/arch/x86/cpu/intel_common/microcode.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c index 0d086e87fa..8377053164 100644 --- a/board/Arcturus/ucp1020/ucp1020.c +++ b/board/Arcturus/ucp1020/ucp1020.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/a4m072/a4m072.c b/board/a4m072/a4m072.c index 20d8b80f7e..31b877f57c 100644 --- a/board/a4m072/a4m072.c +++ b/board/a4m072/a4m072.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 6ea004c214..6e46980329 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c index 7582d40ad1..de8abeca1d 100644 --- a/board/amcc/katmai/katmai.c +++ b/board/amcc/katmai/katmai.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c index 29372178f3..c12fa7b9ba 100644 --- a/board/amcc/kilauea/kilauea.c +++ b/board/amcc/kilauea/kilauea.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c index 2194942cd5..90ac850f90 100644 --- a/board/amcc/makalu/makalu.c +++ b/board/amcc/makalu/makalu.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index 91c6cbf7aa..a95e8559b3 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c index 56b5191d66..11cd0c4f40 100644 --- a/board/amcc/yosemite/yosemite.c +++ b/board/amcc/yosemite/yosemite.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c index c7adf950f5..b143e04097 100644 --- a/board/armltd/vexpress/vexpress_tc2.c +++ b/board/armltd/vexpress/vexpress_tc2.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #define SCC_BASE 0x7fff0000 diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index fce998d00f..e699d22a91 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -27,7 +27,7 @@ #include #ifdef CONFIG_OF_LIBFDT -#include +#include #include #endif /* CONFIG_OF_LIBFDT */ diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index a4a602943e..e2d25e4386 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -764,7 +764,7 @@ int board_late_init(void) #ifdef CONFIG_SPL_BUILD #include #include -#include +#include #include #include diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c index 5b60654991..ddc283297f 100644 --- a/board/el/el6x/el6x.c +++ b/board/el/el6x/el6x.c @@ -480,7 +480,7 @@ int checkboard(void) #ifdef CONFIG_SPL_BUILD #include -#include +#include const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = { .dram_sdclk_0 = 0x00020030, diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index c1520073a7..6c446c1d21 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -187,7 +187,7 @@ int dram_init(void) } #ifdef CONFIG_SPL_BUILD -#include +#include #include #include diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c index c510ab13ac..a6134a5b0d 100644 --- a/board/esd/cpci405/cpci405.c +++ b/board/esd/cpci405/cpci405.c @@ -6,7 +6,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c index 31ac72861f..4fb10b0bfa 100644 --- a/board/esd/pmc405de/pmc405de.c +++ b/board/esd/pmc405de/pmc405de.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c index 0d43505e35..92007923a9 100644 --- a/board/esd/pmc440/pmc440.c +++ b/board/esd/pmc440/pmc440.c @@ -14,7 +14,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c index f8f1834b59..089a86112b 100644 --- a/board/esd/vme8349/vme8349.c +++ b/board/esd/vme8349/vme8349.c @@ -17,7 +17,7 @@ #include #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #endif #include #include diff --git a/board/freescale/b4860qds/pci.c b/board/freescale/b4860qds/pci.c index d9ccac7a6a..1216d63299 100644 --- a/board/freescale/b4860qds/pci.c +++ b/board/freescale/b4860qds/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c index fb8bb39d87..8a94ac37b9 100644 --- a/board/freescale/bsc9131rdb/bsc9131rdb.c +++ b/board/freescale/bsc9131rdb/bsc9131rdb.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c index 2c836da63b..debdf641b0 100644 --- a/board/freescale/bsc9132qds/bsc9132qds.c +++ b/board/freescale/bsc9132qds/bsc9132qds.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/c29xpcie/c29xpcie.c b/board/freescale/c29xpcie/c29xpcie.c index 45f463f01f..2ef87d1c00 100644 --- a/board/freescale/c29xpcie/c29xpcie.c +++ b/board/freescale/c29xpcie/c29xpcie.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c index 571dfbbaad..90bd7bc9e2 100644 --- a/board/freescale/common/cds_pci_ft.c +++ b/board/freescale/common/cds_pci_ft.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include "cadmus.h" diff --git a/board/freescale/common/fman.c b/board/freescale/common/fman.c index b5025ab14e..e6952b5e55 100644 --- a/board/freescale/common/fman.c +++ b/board/freescale/common/fman.c @@ -5,8 +5,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c index 9f4f808376..ccea8b17cf 100644 --- a/board/freescale/common/p_corenet/pci.c +++ b/board/freescale/common/p_corenet/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c index 5c3c59375c..f3e0fb2cd5 100644 --- a/board/freescale/common/sgmii_riser.c +++ b/board/freescale/common/sgmii_riser.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c index bf263761f1..e2767d4336 100644 --- a/board/freescale/ls1043aqds/eth.c +++ b/board/freescale/ls1043aqds/eth.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c index d0a88d4ef9..c44c15db27 100644 --- a/board/freescale/ls2080a/ls2080a.c +++ b/board/freescale/ls2080a/ls2080a.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index d07ca18af9..cbc4d6ae9e 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index 83d9e7ec12..08cbe6ea23 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c index b4a0dd5d1a..93c7200509 100644 --- a/board/freescale/mpc8308rdb/mpc8308rdb.c +++ b/board/freescale/mpc8308rdb/mpc8308rdb.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c index eac193e817..ca8bd7c49f 100644 --- a/board/freescale/mpc8313erdb/mpc8313erdb.c +++ b/board/freescale/mpc8313erdb/mpc8313erdb.c @@ -8,7 +8,7 @@ #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #endif #include #include diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index 3cec09b586..6101260278 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index 0a0152ad9e..13cf2411b6 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #if defined(CONFIG_PCI) #include #endif diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c index adf425486e..9da9a1ef7b 100644 --- a/board/freescale/mpc832xemds/mpc832xemds.c +++ b/board/freescale/mpc832xemds/mpc832xemds.c @@ -17,7 +17,7 @@ #endif #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #endif #if defined(CONFIG_PQ_MDS_PIB) #include "../common/pq-mds-pib.h" diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c index 02b5040ef4..af1c3e72fc 100644 --- a/board/freescale/mpc8349emds/mpc8349emds.c +++ b/board/freescale/mpc8349emds/mpc8349emds.c @@ -19,7 +19,7 @@ #endif #if defined(CONFIG_OF_LIBFDT) -#include +#include #endif int fixed_sdram(void); diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c index 22a1d99c88..fd2ce7218e 100644 --- a/board/freescale/mpc8349itx/mpc8349itx.c +++ b/board/freescale/mpc8349itx/mpc8349itx.c @@ -17,7 +17,7 @@ #include #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #endif #ifndef CONFIG_SPD_EEPROM diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 045841d57b..6dd139e862 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index cede1da634..51cb637606 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c index 1069e2c8c8..2ad79e2d60 100644 --- a/board/freescale/mpc8540ads/mpc8540ads.c +++ b/board/freescale/mpc8540ads/mpc8540ads.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index 7b264dddd1..33ced17a64 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include "../common/cadmus.h" diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 66fb228a90..a283365ba7 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index de76d36174..7574b1d4a0 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c index de5f5669e6..9c74bfdd1d 100644 --- a/board/freescale/mpc8555cds/mpc8555cds.c +++ b/board/freescale/mpc8555cds/mpc8555cds.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include "../common/cadmus.h" diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c index f99d639b2f..a603c2f67f 100644 --- a/board/freescale/mpc8560ads/mpc8560ads.c +++ b/board/freescale/mpc8560ads/mpc8560ads.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index a5c5d9dd1a..4ad4270899 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include "bcsr.h" diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 122490c026..8e72864bec 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index ed6836a930..5ce43a126c 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 95e398c9f4..ea3fe163d6 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 94633b5c99..1d3fe29b27 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 80a77892c9..772a11a943 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -715,7 +715,7 @@ int checkboard(void) #ifdef CONFIG_SPL_BUILD #include -#include +#include #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 96c0e8cfc7..150c0b534d 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -409,7 +409,7 @@ int checkboard(void) #ifdef CONFIG_SPL_BUILD #include -#include +#include const struct mx6sl_iomux_ddr_regs mx6_ddr_ioregs = { .dram_sdqs0 = 0x00003030, diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c index 965e511166..7e909c8782 100644 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c @@ -548,7 +548,7 @@ int checkboard(void) } #ifdef CONFIG_SPL_BUILD -#include +#include #include #include diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 399bad215f..1c12e127d9 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -694,7 +694,7 @@ int checkboard(void) } #ifdef CONFIG_SPL_BUILD -#include +#include #include #include diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index 8eecb0647b..c5ae616a8d 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index 345feac0b2..6b280600aa 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c index 0451722603..17aad34f34 100644 --- a/board/freescale/p1023rdb/p1023rdb.c +++ b/board/freescale/p1023rdb/p1023rdb.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include 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 d61c3a5413..6fefd39a8e 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 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c index f54a6ff8dc..d1e5e8190b 100644 --- a/board/freescale/p1_twr/p1_twr.c +++ b/board/freescale/p1_twr/p1_twr.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c index 6cb5692eda..5d6e640e55 100644 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/freescale/t102xqds/pci.c b/board/freescale/t102xqds/pci.c index 7369289618..5ece77993d 100644 --- a/board/freescale/t102xqds/pci.c +++ b/board/freescale/t102xqds/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c index ba7041af95..f13d41c77d 100644 --- a/board/freescale/t102xrdb/pci.c +++ b/board/freescale/t102xrdb/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/t1040qds/pci.c b/board/freescale/t1040qds/pci.c index c53e3b76a4..68ee74b785 100644 --- a/board/freescale/t1040qds/pci.c +++ b/board/freescale/t1040qds/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c index c53e3b76a4..68ee74b785 100644 --- a/board/freescale/t104xrdb/pci.c +++ b/board/freescale/t104xrdb/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c index 84a89dad4f..5a6731c12b 100644 --- a/board/freescale/t208xqds/pci.c +++ b/board/freescale/t208xqds/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c index ba7041af95..f13d41c77d 100644 --- a/board/freescale/t208xrdb/pci.c +++ b/board/freescale/t208xrdb/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/t4qds/pci.c b/board/freescale/t4qds/pci.c index 08d74b444a..398c62bc48 100644 --- a/board/freescale/t4qds/pci.c +++ b/board/freescale/t4qds/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c index 6387a20cae..36cff0dac4 100644 --- a/board/freescale/t4rdb/pci.c +++ b/board/freescale/t4rdb/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/gdsys/405ex/io64.c b/board/gdsys/405ex/io64.c index 0a7baaa9db..be8fc3c6b9 100644 --- a/board/gdsys/405ex/io64.c +++ b/board/gdsys/405ex/io64.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/gdsys/intip/intip.c b/board/gdsys/intip/intip.c index 2d7d789b23..f65eceae01 100644 --- a/board/gdsys/intip/intip.c +++ b/board/gdsys/intip/intip.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c index c6566e9196..741bc47cb1 100644 --- a/board/gdsys/mpc8308/hrcon.c +++ b/board/gdsys/mpc8308/hrcon.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c index 34e9d1956e..21a64f2ad5 100644 --- a/board/gdsys/mpc8308/strider.c +++ b/board/gdsys/mpc8308/strider.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c index 01064dcfde..8035284a33 100644 --- a/board/gdsys/p1022/controlcenterd.c +++ b/board/gdsys/p1022/controlcenterd.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c index e7838dcd2a..50016c2694 100644 --- a/board/ids/ids8313/ids8313.c +++ b/board/ids/ids8313/ids8313.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; /** CPLD contains the info about: diff --git a/board/ifm/o2dnt2/o2dnt2.c b/board/ifm/o2dnt2/o2dnt2.c index 4fc6809ad6..d21860fe6d 100644 --- a/board/ifm/o2dnt2/o2dnt2.c +++ b/board/ifm/o2dnt2/o2dnt2.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/intercontrol/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c index 2e52d51b6b..643d7093f9 100644 --- a/board/intercontrol/digsy_mtc/digsy_mtc.c +++ b/board/intercontrol/digsy_mtc/digsy_mtc.c @@ -30,7 +30,7 @@ #else #include "is42s16800a-7t.h" #endif -#include +#include #include #include #include diff --git a/board/ipek01/ipek01.c b/board/ipek01/ipek01.c index 2e62355c48..67a1539511 100644 --- a/board/ipek01/ipek01.c +++ b/board/ipek01/ipek01.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c index d56902bcd2..5639f94e21 100644 --- a/board/jupiter/jupiter.c +++ b/board/jupiter/jupiter.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #define SDRAM_DDR 0 #if 1 diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c index c2a7a5f995..63712a8a9d 100644 --- a/board/keymile/km82xx/km82xx.c +++ b/board/keymile/km82xx/km82xx.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include "../common/common.h" diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 154f97457b..a4d432de67 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "../common/common.h" diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c index b827e43a7a..b2c3679719 100644 --- a/board/keymile/kmp204x/pci.c +++ b/board/keymile/kmp204x/pci.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/mosaixtech/icon/icon.c b/board/mosaixtech/icon/icon.c index 7558234abf..fdc7d8f189 100644 --- a/board/mosaixtech/icon/icon.c +++ b/board/mosaixtech/icon/icon.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c index dc237c1ced..6440aef929 100644 --- a/board/motionpro/motionpro.c +++ b/board/motionpro/motionpro.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #if defined(CONFIG_STATUS_LED) #include diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c index 234a387801..e96645f82d 100644 --- a/board/mpc8308_p1m/mpc8308_p1m.c +++ b/board/mpc8308_p1m/mpc8308_p1m.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c index c3607daf46..c1718d7ae0 100644 --- a/board/phytec/pcm058/pcm058.c +++ b/board/phytec/pcm058/pcm058.c @@ -400,7 +400,7 @@ int board_late_init(void) #ifdef CONFIG_SPL_BUILD #include -#include +#include static const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = { .dram_sdclk_0 = 0x00000030, diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c index 72786d2ace..227b5a1874 100644 --- a/board/sbc8349/sbc8349.c +++ b/board/sbc8349/sbc8349.c @@ -16,7 +16,7 @@ #include #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #endif int fixed_sdram(void); diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 25329e4473..1a48a6c89f 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index 6bdf1a28e9..e7310afdc8 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include long int fixed_sdram (void); diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index 8b34a80e8f..11f2139379 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 53656383d5..4d39190f8c 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/t3corp/t3corp.c b/board/t3corp/t3corp.c index 586c6f9a62..bf596ca244 100644 --- a/board/t3corp/t3corp.c +++ b/board/t3corp/t3corp.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 9260ddccbf..669370b8e3 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -921,7 +921,7 @@ void ldo_mode_set(int ldo_bypass) #ifdef CONFIG_SPL_BUILD #include -#include +#include #include "asm/arch/mx6q-ddr.h" #include "asm/arch/iomux.h" #include "asm/arch/crm_regs.h" diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index f3181a0fa1..118964cddd 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include "../common/tdx-cfg-block.h" @@ -775,7 +775,7 @@ void ldo_mode_set(int ldo_bypass) #ifdef CONFIG_SPL_BUILD #include -#include +#include #include "asm/arch/mx6dl-ddr.h" #include "asm/arch/iomux.h" #include "asm/arch/crm_regs.h" diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index b48d0df605..d0666d4c2a 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "tdx-cfg-block.h" #include "tdx-common.h" diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c index fef9d2b29a..b5dffa1ced 100644 --- a/board/tqc/tqm5200/tqm5200.c +++ b/board/tqc/tqm5200/tqm5200.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c index 6d17830575..e5f3608bfa 100644 --- a/board/tqc/tqm8xx/tqm8xx.c +++ b/board/tqc/tqm8xx/tqm8xx.c @@ -13,7 +13,7 @@ #endif #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) -#include +#include #endif extern flash_info_t flash_info[]; /* FLASH chips info */ diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c index c8fc95d52b..fbcfc0b23a 100644 --- a/board/tqc/tqma6/tqma6.c +++ b/board/tqc/tqma6/tqma6.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c index 4db1a0bb7d..a34acb851a 100644 --- a/board/tqc/tqma6/tqma6_mba6.c +++ b/board/tqc/tqma6/tqma6_mba6.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c index 2bbb614e4f..7ee6861f89 100644 --- a/board/tqc/tqma6/tqma6_wru4.c +++ b/board/tqc/tqma6/tqma6_wru4.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c index 4780e8c147..1853b197e7 100644 --- a/board/varisys/cyrus/pci.c +++ b/board/varisys/cyrus/pci.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c index 7f24a30688..18a6c83e58 100644 --- a/board/ve8313/ve8313.c +++ b/board/ve8313/ve8313.c @@ -10,7 +10,7 @@ */ #include -#include +#include #include #include #include diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index 27056e195a..5de96cf447 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c index 510f638ffe..d1658c9c45 100644 --- a/board/xes/common/fsl_8xxx_pci.c +++ b/board/xes/common/fsl_8xxx_pci.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c index 6a3df52391..4b3a46c8cb 100644 --- a/board/xes/xpedite520x/xpedite520x.c +++ b/board/xes/xpedite520x/xpedite520x.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c index 41419feb17..ae606f5ba7 100644 --- a/board/xes/xpedite537x/xpedite537x.c +++ b/board/xes/xpedite537x/xpedite537x.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c index 1f05150d0f..c90bb89dae 100644 --- a/board/xes/xpedite550x/xpedite550x.c +++ b/board/xes/xpedite550x/xpedite550x.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/cmd/bootefi.c b/cmd/bootefi.c index c8079c4fe8..14ac690b56 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/cmd/fdt.c b/cmd/fdt.c index e73db4e772..5159c7ddd6 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/common/board_info.c b/common/board_info.c index aa45e24b34..16cf966233 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include int __weak checkboard(void) diff --git a/common/bootm_os.c b/common/bootm_os.c index 582d968644..101b13e589 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/common/bootstage.c b/common/bootstage.c index 35bce3d881..800645ed8f 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include #include diff --git a/common/fdt_support.c b/common/fdt_support.c index 2ef812bfa6..ebb18c8901 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/common/image-fdt.c b/common/image-fdt.c index 5454227fc9..d1efa6a274 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/common/image.c b/common/image.c index 7604494a56..7f15919913 100644 --- a/common/image.c +++ b/common/image.c @@ -30,7 +30,7 @@ #include #if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT -#include +#include #include #include #include diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c index 2ba00f6d34..5ec3ece900 100644 --- a/common/lcd_simplefb.c +++ b/common/lcd_simplefb.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index a14acceebb..c884402b24 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include static int fat_registered; diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index aae556f97d..8ab600887e 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include static ulong fdt_getprop_u32(const void *fdt, int node, const char *prop) diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index d1abda6e4c..5970a9abfa 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #if defined(CONFIG_SPL_NAND_RAW_ONLY) diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index 13e8e51da9..32d7fbb27f 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #define BUF_SIZE 1024 diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c index c68bcba54f..b7e72fd164 100644 --- a/drivers/core/regmap.c +++ b/drivers/core/regmap.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/core/root.c b/drivers/core/root.c index 33dc9c0b2d..5d1fb9ff68 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c index 0940faf768..470e662d8e 100644 --- a/drivers/crypto/fsl/sec.c +++ b/drivers/crypto/fsl/sec.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #if CONFIG_SYS_FSL_SEC_COMPAT == 2 || CONFIG_SYS_FSL_SEC_COMPAT >= 4 #include diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c index c440399a09..01d2455e52 100644 --- a/drivers/mmc/exynos_dw_mmc.c +++ b/drivers/mmc/exynos_dw_mmc.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index c56e1a3a1c..bbf815adb4 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index b329bef5fd..0933ede345 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index 0a22e58295..0585e627cb 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 3da138562a..72bf9f102e 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 1811b0fe1a..18693af6b4 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 52792dcd59..4ca743e650 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -879,7 +879,7 @@ int fsl_pcie_init_board(int busno) #endif #ifdef CONFIG_OF_BOARD_SETUP -#include +#include #include void ft_fsl_pci_setup(void *blob, const char *pci_compat, diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index 0f8e3c9fcb..dcea192418 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index 2e6b986dbc..7631211145 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -769,7 +769,7 @@ void pci_init_board(void) } #ifdef CONFIG_OF_BOARD_SETUP -#include +#include #include static void ft_pcie_ls_setup(void *blob, const char *pci_compat, diff --git a/drivers/pci/tsi108_pci.c b/drivers/pci/tsi108_pci.c index d48e1e6fe6..bce8b79b68 100644 --- a/drivers/pci/tsi108_pci.c +++ b/drivers/pci/tsi108_pci.c @@ -16,7 +16,7 @@ #include #include #if defined(CONFIG_OF_LIBFDT) -#include +#include #include #endif diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 02ab9b4afd..1a492a387a 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c index e8164bfd08..5c44c07adf 100644 --- a/drivers/power/pmic/act8846.c +++ b/drivers/power/pmic/act8846.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/power/pmic/rk808.c b/drivers/power/pmic/rk808.c index 770f471672..e53fbd8c56 100644 --- a/drivers/power/pmic/rk808.c +++ b/drivers/power/pmic/rk808.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/power/pmic/rn5t567.c b/drivers/power/pmic/rn5t567.c index 001e69553e..9e5b0b119b 100644 --- a/drivers/power/pmic/rn5t567.c +++ b/drivers/power/pmic/rn5t567.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c index b0a4c5da6d..bc45e63b31 100644 --- a/drivers/power/regulator/pwm_regulator.c +++ b/drivers/power/regulator/pwm_regulator.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c index 4f48f984ab..9bbdc60353 100644 --- a/drivers/qe/fdt.c +++ b/drivers/qe/fdt.c @@ -8,7 +8,7 @@ */ #include -#include +#include #include #include diff --git a/drivers/sound/sound-i2s.c b/drivers/sound/sound-i2s.c index 749bbbd031..be69fb0b01 100644 --- a/drivers/sound/sound-i2s.c +++ b/drivers/sound/sound-i2s.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index 35c2dc18d9..1b99d4810d 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -8,7 +8,7 @@ */ #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 53281d78b3..b3e693c696 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 6484c1c334..5d31ad8463 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index e3620da15f..ad61be7c95 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include "ehci.h" diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index f389bff171..b86661c6fb 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "ehci.h" diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index 82fcd84ef2..8b0b5bf86e 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c index 8cbcb8f923..34996bea69 100644 --- a/drivers/usb/host/xhci-rockchip.c +++ b/drivers/usb/host/xhci-rockchip.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c index 1958478d62..01bda15bd6 100644 --- a/drivers/usb/phy/rockchip_usb2_phy.c +++ b/drivers/usb/phy/rockchip_usb2_phy.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "../gadget/dwc2_udc_otg_priv.h" diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c index fc39f2c562..d034f1e53b 100644 --- a/drivers/video/exynos/exynos_dp.c +++ b/drivers/video/exynos/exynos_dp.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c index aae78a8159..f84dd7097f 100644 --- a/drivers/video/exynos/exynos_dp_lowlevel.c +++ b/drivers/video/exynos/exynos_dp_lowlevel.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "exynos_dp_lowlevel.h" /* Declare global data pointer */ diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c index 5483d6613f..0b7e74ae17 100644 --- a/drivers/video/exynos/exynos_fb.c +++ b/drivers/video/exynos/exynos_fb.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c index a5d9b59218..724d08f7ae 100644 --- a/drivers/video/exynos/exynos_mipi_dsi.c +++ b/drivers/video/exynos/exynos_mipi_dsi.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/compiler.h b/include/compiler.h index 65b826e4d1..59a465ead9 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -132,7 +132,11 @@ typedef unsigned int uint; #include #else /* Type for `void *' pointers. */ +#ifndef __UINTPTR_TYPE__ typedef unsigned long int uintptr_t; +#else +typedef __UINTPTR_TYPE__ uintptr_t; +#endif #endif #include diff --git a/include/fdt_support.h b/include/fdt_support.h index 57bfbeb668..51d226af52 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -10,7 +10,7 @@ #ifdef CONFIG_OF_LIBFDT -#include +#include u32 fdt_getprop_u32_default_node(const void *fdt, int off, int cell, const char *prop, const u32 dflt); diff --git a/include/fdtdec.h b/include/fdtdec.h index 27887c8c21..11a4b4fe9a 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -14,7 +14,7 @@ * changes to support FDT are minimized. */ -#include +#include #include /* diff --git a/include/image.h b/include/image.h index 2b1296c86c..ea48686394 100644 --- a/include/image.h +++ b/include/image.h @@ -50,7 +50,7 @@ struct lmb; #if IMAGE_ENABLE_FIT #include -#include +#include #include # ifdef CONFIG_SPL_BUILD # ifdef CONFIG_SPL_CRC32_SUPPORT diff --git a/include/libfdt.h b/include/linux/libfdt.h similarity index 99% rename from include/libfdt.h rename to include/linux/libfdt.h index e2bc2e00c1..a58b1d0853 100644 --- a/include/libfdt.h +++ b/include/linux/libfdt.h @@ -51,7 +51,13 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include +#include +#include +#include +#ifndef USE_HOSTCC +#include +#endif #include #define FDT_FIRST_SUPPORTED_VERSION 0x10 diff --git a/include/libfdt_env.h b/include/linux/libfdt_env.h similarity index 78% rename from include/libfdt_env.h rename to include/linux/libfdt_env.h index 6c6845f76c..74734b908a 100644 --- a/include/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -6,6 +6,14 @@ * SPDX-License-Identifier: LGPL-2.1+ */ +#ifdef USE_HOSTCC +#include +#else +/* + * This position of the include guard is intentional. + * Using the same guard name as that of scripts/dtc/libfdt/libfdt_env.h + * prevents it from being included. + */ #ifndef _LIBFDT_ENV_H #define _LIBFDT_ENV_H @@ -33,3 +41,5 @@ typedef __be64 fdt64_t; #define FDT_RAMDISK_OVERHEAD 0x80 #endif /* _LIBFDT_ENV_H */ +#endif /* USE_HOSTCC */ + diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 1fdddf4591..3759ffdcb3 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 95aa590c8a..a69a67465e 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 4e619c49a2..a37f96ed29 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/fdtdec_common.c b/lib/fdtdec_common.c index 63b704a3d7..2d083418e0 100644 --- a/lib/fdtdec_common.c +++ b/lib/fdtdec_common.c @@ -10,7 +10,7 @@ #ifndef USE_HOSTCC #include -#include +#include #include #else #include "libfdt.h" diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c index cc8b918f64..c51ffd7ecf 100644 --- a/lib/fdtdec_test.c +++ b/lib/fdtdec_test.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/lib/libfdt/Makefile b/lib/libfdt/Makefile index 6ef8290f4e..f1f9deb101 100644 --- a/lib/libfdt/Makefile +++ b/lib/libfdt/Makefile @@ -17,3 +17,5 @@ obj-y += \ fdt_region.o obj-$(CONFIG_OF_LIBFDT_OVERLAY) += fdt_overlay.o + +ccflags-y := -I$(srctree)/scripts/dtc/libfdt diff --git a/lib/libfdt/fdt.c b/lib/libfdt/fdt.c index 2055734012..2fdd92b342 100644 --- a/lib/libfdt/fdt.c +++ b/lib/libfdt/fdt.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_addresses.c b/lib/libfdt/fdt_addresses.c index b6bc66ea32..e1e7a5bac0 100644 --- a/lib/libfdt/fdt_addresses.c +++ b/lib/libfdt/fdt_addresses.c @@ -3,11 +3,11 @@ * Copyright (C) 2014 David Gibson * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_empty_tree.c b/lib/libfdt/fdt_empty_tree.c index 6fde1eb9ed..e6ca82c162 100644 --- a/lib/libfdt/fdt_empty_tree.c +++ b/lib/libfdt/fdt_empty_tree.c @@ -3,9 +3,9 @@ * Copyright (C) 2012 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #include -#include +#include #include "libfdt_internal.h" diff --git a/lib/libfdt/fdt_overlay.c b/lib/libfdt/fdt_overlay.c index 4a9ba40025..b339247827 100644 --- a/lib/libfdt/fdt_overlay.c +++ b/lib/libfdt/fdt_overlay.c @@ -1,10 +1,10 @@ -#include "libfdt_env.h" - +#include #include -#include #include "libfdt_internal.h" +#include + /** * overlay_get_target_phandle - retrieves the target phandle of a fragment * @fdto: pointer to the device tree overlay blob diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c index d2ce4c1c53..11d64a7267 100644 --- a/lib/libfdt/fdt_region.c +++ b/lib/libfdt/fdt_region.c @@ -5,11 +5,11 @@ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c index 1be9538fd2..d972d031c6 100644 --- a/lib/libfdt/fdt_ro.c +++ b/lib/libfdt/fdt_ro.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c index 87d4030fb1..708c15ccb9 100644 --- a/lib/libfdt/fdt_rw.c +++ b/lib/libfdt/fdt_rw.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c index 7f8e02b1ee..5475cf2ee5 100644 --- a/lib/libfdt/fdt_strerror.c +++ b/lib/libfdt/fdt_strerror.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c index 70fd026550..5fcd79377c 100644 --- a/lib/libfdt/fdt_sw.c +++ b/lib/libfdt/fdt_sw.c @@ -3,9 +3,9 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #include -#include +#include #include "libfdt_internal.h" diff --git a/lib/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c index 45fb964120..cb8ee96f5a 100644 --- a/lib/libfdt/fdt_wip.c +++ b/lib/libfdt/fdt_wip.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif diff --git a/tools/Makefile b/tools/Makefile index 9edb504fdd..a499708ae9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -237,7 +237,7 @@ LICENSE-$(CONFIG_CMD_LICENSE) += $(LICENSE_H) # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps # Define _GNU_SOURCE to obtain the getline prototype from stdio.h # -HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ +HOST_EXTRACFLAGS += -include $(srctree)/include/linux/libfdt_env.h \ $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ -I$(srctree)/lib/libfdt \ -I$(srctree)/tools \ diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py index 11050b66f7..a891d1c747 100755 --- a/tools/dtoc/dtoc.py +++ b/tools/dtoc/dtoc.py @@ -260,7 +260,7 @@ class DtbPlatdata: README.of-plat for more information. """ self.Out('#include \n') - self.Out('#include \n') + self.Out('#include \n') # Output the struct definition for name in sorted(structs): diff --git a/tools/fdt_host.h b/tools/fdt_host.h index 134d965713..5455095b83 100644 --- a/tools/fdt_host.h +++ b/tools/fdt_host.h @@ -8,9 +8,11 @@ #define __FDT_HOST_H__ /* Make sure to include u-boot version of libfdt include files */ -#include "../include/libfdt.h" +#include "../include/linux/libfdt.h" #include "../include/fdt_support.h" +#include + int fit_check_sign(const void *working_fdt, const void *key); #endif /* __FDT_HOST_H__ */ diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index b9078273c9..8272196238 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -10,14 +10,20 @@ #include #include +#include #include +#include #include #include #include #include -#include <../include/libfdt.h> -#include +#include +#include +#include + +#include <../include/linux/libfdt.h> +#include "libfdt_internal.h" /* Define DEBUG to get some debugging output on stderr */ #ifdef DEBUG diff --git a/tools/ifdtool.c b/tools/ifdtool.c index 48059c02b5..6f4c001a6e 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "ifdtool.h" #undef DEBUG -- 2.14.5