diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2019-03-16 23:19:04 +0100 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2019-03-28 02:10:12 +0100 |
| commit | 95f07502b760ace99b5555fea8b4faa743a137c1 (patch) | |
| tree | 3ba131805deb22193c032f170ff31d0099e50803 /package/boot/uboot-omap | |
| parent | 28920330f86d628a287f00f2596f4aaead8e2e19 (diff) | |
| download | upstream-95f07502b760ace99b5555fea8b4faa743a137c1.tar.gz upstream-95f07502b760ace99b5555fea8b4faa743a137c1.tar.bz2 upstream-95f07502b760ace99b5555fea8b4faa743a137c1.zip | |
package/uboot-omap: backport patches to fix build
* 106: fix build when libfdt-devel is installed on host
* 107: fix stdbool.h includes
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
Diffstat (limited to 'package/boot/uboot-omap')
3 files changed, 3168 insertions, 1 deletions
diff --git a/package/boot/uboot-omap/Makefile b/package/boot/uboot-omap/Makefile index 69f234d182..f2a26796d8 100644 --- a/package/boot/uboot-omap/Makefile +++ b/package/boot/uboot-omap/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_VERSION:=2017.01 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_HASH:=6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2 diff --git a/package/boot/uboot-omap/patches/106-backport-from-upstream-b08c8c4870831c9315dcae2377722.patch b/package/boot/uboot-omap/patches/106-backport-from-upstream-b08c8c4870831c9315dcae2377722.patch new file mode 100644 index 0000000000..d7ea411521 --- /dev/null +++ b/package/boot/uboot-omap/patches/106-backport-from-upstream-b08c8c4870831c9315dcae2377722.patch @@ -0,0 +1,3092 @@ +From 5da90396c3bfdc3530e0b54d4cd284deb03f806e Mon Sep 17 00:00:00 2001 +From: Alexander Couzens <lynxis@fe80.eu> +Date: Sun, 10 Mar 2019 17:38:22 +0100 +Subject: [PATCH 1/2] backport from upstream + b08c8c4870831c9315dcae237772238e80035bd5 + +Fix build if libfdt-devel is installed +--- + arch/arm/cpu/armv7/ls102xa/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-litesom/litesom.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-omap2/omap5/fdt.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/geam6ul/geam6ul.c | 2 +- + board/engicam/icorem6/icorem6.c | 2 +- + board/engicam/icorem6_rqs/icorem6_rqs.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 | 2 +- + 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/udoo/neo/neo.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 | 4 ++-- + 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/fdt_support.h | 2 +- + include/fdtdec.h | 2 +- + include/image.h | 2 +- + include/{ => linux}/libfdt.h | 2 +- + include/{ => linux}/libfdt_env.h | 4 ++-- + lib/efi_loader/efi_boottime.c | 2 +- + lib/efi_loader/efi_memory.c | 2 +- + lib/fdtdec.c | 2 +- + lib/fdtdec_common.c | 4 ++-- + lib/fdtdec_test.c | 2 +- + lib/libfdt/fdt.c | 4 ++-- + lib/libfdt/fdt_addresses.c | 4 ++-- + lib/libfdt/fdt_empty_tree.c | 4 ++-- + lib/libfdt/fdt_overlay.c | 4 ++-- + 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 ++-- + lib/libfdt/libfdt.swig | 2 +- + tools/Makefile | 2 +- + tools/dtoc/dtoc.py | 2 +- + tools/fdt_host.h | 2 +- + tools/fdtgrep.c | 2 +- + tools/ifdtool.c | 2 +- + 215 files changed, 230 insertions(+), 230 deletions(-) + rename include/{ => linux}/libfdt.h (99%) + rename include/{ => linux}/libfdt_env.h (94%) + +diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c +index ae5e794230cd..e64ac9185b43 100644 +--- a/arch/arm/cpu/armv7/ls102xa/fdt.c ++++ b/arch/arm/cpu/armv7/ls102xa/fdt.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/io.h> + #include <asm/processor.h> +diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c +index 707dad4829a9..204187c1b4b3 100644 +--- a/arch/arm/cpu/armv7/virt-dt.c ++++ b/arch/arm/cpu/armv7/virt-dt.c +@@ -21,7 +21,7 @@ + #include <linux/ctype.h> + #include <linux/types.h> + #include <asm/global_data.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/armv7.h> + #include <asm/psci.h> +diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +index c10ccf9063a6..33a7504bb604 100644 +--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c ++++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +@@ -6,7 +6,7 @@ + + #include <common.h> + #include <efi_loader.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <phy.h> + #ifdef CONFIG_FSL_LSCH3 +diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c +index ec1c9b8ddb6f..195901a7a715 100644 +--- a/arch/arm/cpu/armv8/spin_table.c ++++ b/arch/arm/cpu/armv8/spin_table.c +@@ -6,7 +6,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <asm/spin_table.h> + + int spin_table_update_dt(void *fdt) +diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c +index 43cc83ec95b6..294ee3f2736e 100644 +--- a/arch/arm/lib/bootm.c ++++ b/arch/arm/lib/bootm.c +@@ -17,7 +17,7 @@ + #include <image.h> + #include <u-boot/zlib.h> + #include <asm/byteorder.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <mapmem.h> + #include <fdt_support.h> + #include <asm/bootm.h> +diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c +index 45af037f0a48..601f2bae3ee4 100644 +--- a/arch/arm/lib/psci-dt.c ++++ b/arch/arm/lib/psci-dt.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <linux/sizes.h> + #include <linux/kernel.h> +diff --git a/arch/arm/mach-litesom/litesom.c b/arch/arm/mach-litesom/litesom.c +index ac2eccff06f5..db5e4d02190c 100644 +--- a/arch/arm/mach-litesom/litesom.c ++++ b/arch/arm/mach-litesom/litesom.c +@@ -77,7 +77,7 @@ int litesom_mmc_init(bd_t *bis) + #endif + + #ifdef CONFIG_SPL_BUILD +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <spl.h> + #include <asm/arch/mx6-ddr.h> + +diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c +index f159cbf849f7..3b23610354c5 100644 +--- a/arch/arm/mach-meson/board.c ++++ b/arch/arm/mach-meson/board.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <linux/err.h> + #include <asm/arch/gxbb.h> + #include <asm/arch/sm.h> +diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c +index 8f026559c2f9..8260ee7884d6 100644 +--- a/arch/arm/mach-mvebu/arm64-common.c ++++ b/arch/arm/mach-mvebu/arm64-common.c +@@ -7,7 +7,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <asm/io.h> + #include <asm/system.h> + #include <asm/arch/cpu.h> +diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c +index 6499eec4eaf0..b9214f7bd9e1 100644 +--- a/arch/arm/mach-mvebu/armada3700/cpu.c ++++ b/arch/arm/mach-mvebu/armada3700/cpu.c +@@ -7,7 +7,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <asm/io.h> + #include <asm/system.h> + #include <asm/arch/cpu.h> +diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c +index 2325e9a180ba..28c9efd20067 100644 +--- a/arch/arm/mach-mvebu/armada8k/cpu.c ++++ b/arch/arm/mach-mvebu/armada8k/cpu.c +@@ -7,7 +7,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <asm/io.h> + #include <asm/system.h> + #include <asm/arch/cpu.h> +diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c +index 900f0010f661..3b82b81eeb65 100644 +--- a/arch/arm/mach-omap2/omap5/fdt.c ++++ b/arch/arm/mach-omap2/omap5/fdt.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <malloc.h> + +diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c +index dd6b53b24df0..1a8e49d8afa9 100644 +--- a/arch/arm/mach-socfpga/misc.c ++++ b/arch/arm/mach-socfpga/misc.c +@@ -8,7 +8,7 @@ + #include <asm/io.h> + #include <errno.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <altera.h> + #include <miiphy.h> + #include <netdev.h> +diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c +index 8c7864cb85d5..ad0973b4c93d 100644 +--- a/arch/arm/mach-uniphier/board_init.c ++++ b/arch/arm/mach-uniphier/board_init.c +@@ -7,7 +7,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <linux/io.h> + + #include "init.h" +diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c +index ece761fb948b..e2387762b746 100644 +--- a/arch/arm/mach-uniphier/board_late_init.c ++++ b/arch/arm/mach-uniphier/board_late_init.c +@@ -8,7 +8,7 @@ + + #include <common.h> + #include <spl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <nand.h> + #include <linux/io.h> + #include <../drivers/mtd/nand/denali.h> +diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c +index 059645171a72..0c91d2efd6d3 100644 +--- a/arch/arm/mach-uniphier/boards.c ++++ b/arch/arm/mach-uniphier/boards.c +@@ -6,7 +6,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <linux/kernel.h> + + #include "init.h" +diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c +index 489366c63f94..828f205869e7 100644 +--- a/arch/arm/mach-uniphier/dram_init.c ++++ b/arch/arm/mach-uniphier/dram_init.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdtdec.h> + #include <linux/err.h> + +diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c +index a44f51a7f2a8..8f8abfba8c4d 100644 +--- a/arch/nios2/cpu/fdt.c ++++ b/arch/nios2/cpu/fdt.c +@@ -13,7 +13,7 @@ + #include <common.h> + + #ifdef CONFIG_OF_BOARD_SETUP +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + DECLARE_GLOBAL_DATA_PTR; +diff --git a/arch/powerpc/cpu/mpc512x/pci.c b/arch/powerpc/cpu/mpc512x/pci.c +index 7ea5df2960be..e823c1bbcedb 100644 +--- a/arch/powerpc/cpu/mpc512x/pci.c ++++ b/arch/powerpc/cpu/mpc512x/pci.c +@@ -12,7 +12,7 @@ + #include <asm/global_data.h> + #include <pci.h> + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif + +diff --git a/arch/powerpc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c +index 84fabbd473ac..7b01b4efb26f 100644 +--- a/arch/powerpc/cpu/mpc5xxx/cpu.c ++++ b/arch/powerpc/cpu/mpc5xxx/cpu.c +@@ -19,7 +19,7 @@ + #include <asm/processor.h> + + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif + +diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c +index 9f2be3cb22c7..68ce80e6f192 100644 +--- a/arch/powerpc/cpu/mpc8260/cpu.c ++++ b/arch/powerpc/cpu/mpc8260/cpu.c +@@ -33,7 +33,7 @@ + #include <asm/cpm_8260.h> + + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif + +diff --git a/arch/powerpc/cpu/mpc8260/pci.c b/arch/powerpc/cpu/mpc8260/pci.c +index 56f290ca92d6..2700046ce140 100644 +--- a/arch/powerpc/cpu/mpc8260/pci.c ++++ b/arch/powerpc/cpu/mpc8260/pci.c +@@ -18,7 +18,7 @@ + #include <asm/m8260_pci.h> + #include <asm/io.h> + #ifdef CONFIG_OF_LIBFDT +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif + +diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c +index c87f0fdd29f5..919289b70a98 100644 +--- a/arch/powerpc/cpu/mpc83xx/cpu.c ++++ b/arch/powerpc/cpu/mpc83xx/cpu.c +@@ -15,7 +15,7 @@ + #include <command.h> + #include <mpc83xx.h> + #include <asm/processor.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <tsec.h> + #include <netdev.h> + #include <fsl_esdhc.h> +diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c +index f249a585edf1..c51eb9a01065 100644 +--- a/arch/powerpc/cpu/mpc83xx/fdt.c ++++ b/arch/powerpc/cpu/mpc83xx/fdt.c +@@ -8,7 +8,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/processor.h> + +diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c +index c7ea94cab561..bf41c69d8803 100644 +--- a/arch/powerpc/cpu/mpc83xx/pci.c ++++ b/arch/powerpc/cpu/mpc83xx/pci.c +@@ -11,7 +11,7 @@ + #include <pci.h> + + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif + +diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c +index 67140ba9ee18..4124be5afe87 100644 +--- a/arch/powerpc/cpu/mpc85xx/fdt.c ++++ b/arch/powerpc/cpu/mpc85xx/fdt.c +@@ -8,7 +8,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/processor.h> + #include <linux/ctype.h> +diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c +index 7a4465fefc5b..6cfe2f67593e 100644 +--- a/arch/powerpc/cpu/mpc85xx/liodn.c ++++ b/arch/powerpc/cpu/mpc85xx/liodn.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + #include <asm/immap_85xx.h> +diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c +index 3777c6faa166..abb12837d20e 100644 +--- a/arch/powerpc/cpu/mpc85xx/portals.c ++++ b/arch/powerpc/cpu/mpc85xx/portals.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + #include <asm/processor.h> +diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c +index 5f9ad6b0b6d4..0074d3ce6d65 100644 +--- a/arch/powerpc/cpu/mpc86xx/fdt.c ++++ b/arch/powerpc/cpu/mpc86xx/fdt.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/mp.h> + +diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c +index 105be9ccc7e1..ca3b52396756 100644 +--- a/arch/powerpc/cpu/mpc8xx/cpu.c ++++ b/arch/powerpc/cpu/mpc8xx/cpu.c +@@ -28,7 +28,7 @@ + #include <asm/io.h> + + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif + +diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c +index 97830e3c8bd4..3f612c9aa08f 100644 +--- a/arch/powerpc/cpu/mpc8xx/fdt.c ++++ b/arch/powerpc/cpu/mpc8xx/fdt.c +@@ -7,7 +7,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + DECLARE_GLOBAL_DATA_PTR; +diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c +index 9cc1676b6029..1f928bd136d2 100644 +--- a/arch/powerpc/cpu/mpc8xxx/fdt.c ++++ b/arch/powerpc/cpu/mpc8xxx/fdt.c +@@ -8,7 +8,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/mp.h> + #include <asm/fsl_serdes.h> +diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c +index c73509b3ee35..42fa592ca69a 100644 +--- a/arch/powerpc/cpu/ppc4xx/fdt.c ++++ b/arch/powerpc/cpu/ppc4xx/fdt.c +@@ -12,7 +12,7 @@ + #include <asm/ppc4xx.h> + + #ifdef CONFIG_OF_BOARD_SETUP +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/4xx_pcie.h> + +diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c +index 17c5ed173cb2..a5c257c7a57c 100644 +--- a/arch/powerpc/lib/bootm.c ++++ b/arch/powerpc/lib/bootm.c +@@ -20,7 +20,7 @@ + #include <asm/mp.h> + + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif + +diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c +index 2def72212d1f..938ff3d418a1 100644 +--- a/arch/sandbox/cpu/cpu.c ++++ b/arch/sandbox/cpu/cpu.c +@@ -5,7 +5,7 @@ + #define DEBUG + #include <common.h> + #include <errno.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <os.h> + #include <asm/io.h> + #include <asm/state.h> +diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c +index eac5b781e94c..881325875459 100644 +--- a/arch/x86/cpu/intel_common/microcode.c ++++ b/arch/x86/cpu/intel_common/microcode.c +@@ -10,7 +10,7 @@ + #include <common.h> + #include <errno.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <asm/cpu.h> + #include <asm/microcode.h> + #include <asm/msr.h> +diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c +index 0d086e87fa30..837705316481 100644 +--- a/board/Arcturus/ucp1020/ucp1020.c ++++ b/board/Arcturus/ucp1020/ucp1020.c +@@ -15,7 +15,7 @@ + #include <pci.h> + #include <i2c.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/a4m072/a4m072.c b/board/a4m072/a4m072.c +index 20d8b80f7efe..31b877f57c23 100644 +--- a/board/a4m072/a4m072.c ++++ b/board/a4m072/a4m072.c +@@ -16,7 +16,7 @@ + #include <pci.h> + #include <asm/processor.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <netdev.h> + #include <led-display.h> + #include <linux/err.h> +diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c +index 6ea004c214eb..6e46980329cf 100644 +--- a/board/amcc/canyonlands/canyonlands.c ++++ b/board/amcc/canyonlands/canyonlands.c +@@ -7,7 +7,7 @@ + + #include <common.h> + #include <asm/ppc440.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <i2c.h> + #include <asm/processor.h> +diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c +index 7582d40ad1ac..de8abeca1dc0 100644 +--- a/board/amcc/katmai/katmai.c ++++ b/board/amcc/katmai/katmai.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <asm/ppc4xx.h> + #include <i2c.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <netdev.h> + #include <asm/processor.h> +diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c +index 29372178f3ac..c12fa7b9baea 100644 +--- a/board/amcc/kilauea/kilauea.c ++++ b/board/amcc/kilauea/kilauea.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <asm/ppc4xx.h> + #include <asm/ppc405.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/processor.h> + #include <asm/io.h> +diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c +index 2194942cd5ab..90ac850f9000 100644 +--- a/board/amcc/makalu/makalu.c ++++ b/board/amcc/makalu/makalu.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <asm/ppc4xx.h> + #include <asm/ppc405.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <asm/processor.h> + #include <asm/ppc4xx-gpio.h> + #include <asm/io.h> +diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c +index 91c6cbf7aa80..a95e8559b355 100644 +--- a/board/amcc/sequoia/sequoia.c ++++ b/board/amcc/sequoia/sequoia.c +@@ -11,7 +11,7 @@ + + #include <common.h> + #include <errno.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/ppc4xx.h> + #include <asm/ppc4xx-gpio.h> +diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c +index 56b5191d6667..11cd0c4f40eb 100644 +--- a/board/amcc/yosemite/yosemite.c ++++ b/board/amcc/yosemite/yosemite.c +@@ -10,7 +10,7 @@ + #include <asm/processor.h> + #include <asm/io.h> + #include <spd_sdram.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + DECLARE_GLOBAL_DATA_PTR; +diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c +index c7adf950f579..b143e040974b 100644 +--- a/board/armltd/vexpress/vexpress_tc2.c ++++ b/board/armltd/vexpress/vexpress_tc2.c +@@ -11,7 +11,7 @@ + #include <asm/io.h> + #include <asm/u-boot.h> + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #define SCC_BASE 0x7fff0000 + +diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c +index fce998d00fca..e699d22a913f 100644 +--- a/board/cm5200/cm5200.c ++++ b/board/cm5200/cm5200.c +@@ -27,7 +27,7 @@ + #include <linux/ctype.h> + + #ifdef CONFIG_OF_LIBFDT +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif /* CONFIG_OF_LIBFDT */ + +diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c +index a4a602943ed2..e2d25e43861d 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 <asm/arch/mx6-ddr.h> + #include <spl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <spi_flash.h> + #include <spi.h> + +diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c +index 5b60654991bf..ddc283297fee 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 <spl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = { + .dram_sdclk_0 = 0x00020030, +diff --git a/board/engicam/geam6ul/geam6ul.c b/board/engicam/geam6ul/geam6ul.c +index 40f20a9bec28..2a61976e6010 100644 +--- a/board/engicam/geam6ul/geam6ul.c ++++ b/board/engicam/geam6ul/geam6ul.c +@@ -123,7 +123,7 @@ int dram_init(void) + } + + #ifdef CONFIG_SPL_BUILD +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <spl.h> + + #include <asm/arch/crm_regs.h> +diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c +index 171ec451a15f..f444aa115653 100644 +--- a/board/engicam/icorem6/icorem6.c ++++ b/board/engicam/icorem6/icorem6.c +@@ -229,7 +229,7 @@ int dram_init(void) + } + + #ifdef CONFIG_SPL_BUILD +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <spl.h> + + #include <asm/arch/crm_regs.h> +diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c +index 2769177dd360..1231384be425 100644 +--- a/board/engicam/icorem6_rqs/icorem6_rqs.c ++++ b/board/engicam/icorem6_rqs/icorem6_rqs.c +@@ -53,7 +53,7 @@ int dram_init(void) + } + + #ifdef CONFIG_SPL_BUILD +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <spl.h> + + #include <asm/arch/crm_regs.h> +diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c +index c510ab13acad..a6134a5b0d1f 100644 +--- a/board/esd/cpci405/cpci405.c ++++ b/board/esd/cpci405/cpci405.c +@@ -6,7 +6,7 @@ + */ + #include <common.h> + #include <console.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/processor.h> + #include <asm/io.h> +diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c +index 31ac72861f17..4fb10b0bfa97 100644 +--- a/board/esd/pmc405de/pmc405de.c ++++ b/board/esd/pmc405de/pmc405de.c +@@ -7,7 +7,7 @@ + + #include <common.h> + #include <console.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/processor.h> + #include <asm/io.h> +diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c +index 0d43505e358e..92007923a90f 100644 +--- a/board/esd/pmc440/pmc440.c ++++ b/board/esd/pmc440/pmc440.c +@@ -14,7 +14,7 @@ + */ + #include <common.h> + #include <console.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/ppc440.h> + #include <asm/processor.h> +diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c +index f8f1834b59c1..089a86112b7b 100644 +--- a/board/esd/vme8349/vme8349.c ++++ b/board/esd/vme8349/vme8349.c +@@ -17,7 +17,7 @@ + #include <mpc83xx.h> + #include <asm/mpc8349_pci.h> + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #endif + #include <asm/io.h> + #include <asm/mmu.h> +diff --git a/board/freescale/b4860qds/pci.c b/board/freescale/b4860qds/pci.c +index d9ccac7a6abc..1216d6329915 100644 +--- a/board/freescale/b4860qds/pci.c ++++ b/board/freescale/b4860qds/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c +index fb8bb39d87e3..8a94ac37b98e 100644 +--- a/board/freescale/bsc9131rdb/bsc9131rdb.c ++++ b/board/freescale/bsc9131rdb/bsc9131rdb.c +@@ -11,7 +11,7 @@ + #include <asm/immap_85xx.h> + #include <asm/io.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c +index 2c836da63b2d..debdf641b0ac 100644 +--- a/board/freescale/bsc9132qds/bsc9132qds.c ++++ b/board/freescale/bsc9132qds/bsc9132qds.c +@@ -11,7 +11,7 @@ + #include <asm/immap_85xx.h> + #include <asm/io.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/freescale/c29xpcie/c29xpcie.c b/board/freescale/c29xpcie/c29xpcie.c +index 45f463f01f38..2ef87d1c007e 100644 +--- a/board/freescale/c29xpcie/c29xpcie.c ++++ b/board/freescale/c29xpcie/c29xpcie.c +@@ -11,7 +11,7 @@ + #include <asm/immap_85xx.h> + #include <asm/io.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c +index 571dfbbaada6..90bd7bc9e2e6 100644 +--- a/board/freescale/common/cds_pci_ft.c ++++ b/board/freescale/common/cds_pci_ft.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include "cadmus.h" + +diff --git a/board/freescale/common/fman.c b/board/freescale/common/fman.c +index b5025ab14e84..e6952b5e55bf 100644 +--- a/board/freescale/common/fman.c ++++ b/board/freescale/common/fman.c +@@ -5,8 +5,8 @@ + */ + + #include <common.h> +-#include <libfdt.h> +-#include <libfdt_env.h> ++#include <linux/libfdt.h> ++#include <linux/libfdt_env.h> + #include <fdt_support.h> + + #include <fm_eth.h> +diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c +index 9f4f808376be..ccea8b17cfe0 100644 +--- a/board/freescale/common/p_corenet/pci.c ++++ b/board/freescale/common/p_corenet/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c +index 5c3c59375cbe..f3e0fb2cd5e4 100644 +--- a/board/freescale/common/sgmii_riser.c ++++ b/board/freescale/common/sgmii_riser.c +@@ -15,7 +15,7 @@ + #include <config.h> + #include <common.h> + #include <net.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <tsec.h> + #include <fdt_support.h> + +diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c +index bf263761f1db..e2767d43361a 100644 +--- a/board/freescale/ls1043aqds/eth.c ++++ b/board/freescale/ls1043aqds/eth.c +@@ -11,7 +11,7 @@ + #include <fm_eth.h> + #include <fsl_mdio.h> + #include <fsl_dtsec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <asm/arch/fsl_serdes.h> + +diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c +index 4f9b9c8a7739..93a07261c83d 100644 +--- a/board/freescale/ls2080a/ls2080a.c ++++ b/board/freescale/ls2080a/ls2080a.c +@@ -11,7 +11,7 @@ + #include <fsl_ddr.h> + #include <asm/io.h> + #include <fdt_support.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fsl-mc/fsl_mc.h> + #include <environment.h> + #include <asm/arch/soc.h> +diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c +index 73a61fd75aa1..155025118d36 100644 +--- a/board/freescale/ls2080aqds/ls2080aqds.c ++++ b/board/freescale/ls2080aqds/ls2080aqds.c +@@ -11,7 +11,7 @@ + #include <fsl_ddr.h> + #include <asm/io.h> + #include <fdt_support.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fsl-mc/fsl_mc.h> + #include <environment.h> + #include <i2c.h> +diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c +index 02954ef6d760..3e89b805f614 100644 +--- a/board/freescale/ls2080ardb/ls2080ardb.c ++++ b/board/freescale/ls2080ardb/ls2080ardb.c +@@ -12,7 +12,7 @@ + #include <asm/io.h> + #include <hwconfig.h> + #include <fdt_support.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fsl-mc/fsl_mc.h> + #include <environment.h> + #include <efi_loader.h> +diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c +index b4a0dd5d1a8f..93c7200509c2 100644 +--- a/board/freescale/mpc8308rdb/mpc8308rdb.c ++++ b/board/freescale/mpc8308rdb/mpc8308rdb.c +@@ -9,7 +9,7 @@ + #include <hwconfig.h> + #include <i2c.h> + #include <spi.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <pci.h> + #include <mpc83xx.h> +diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c +index eac193e81776..ca8bd7c49fb0 100644 +--- a/board/freescale/mpc8313erdb/mpc8313erdb.c ++++ b/board/freescale/mpc8313erdb/mpc8313erdb.c +@@ -8,7 +8,7 @@ + + #include <common.h> + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #endif + #include <pci.h> + #include <mpc83xx.h> +diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c +index 3cec09b58686..6101260278ae 100644 +--- a/board/freescale/mpc8315erdb/mpc8315erdb.c ++++ b/board/freescale/mpc8315erdb/mpc8315erdb.c +@@ -10,7 +10,7 @@ + #include <common.h> + #include <hwconfig.h> + #include <i2c.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <pci.h> + #include <mpc83xx.h> +diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c +index 0a0152ad9ea3..13cf2411b65d 100644 +--- a/board/freescale/mpc8323erdb/mpc8323erdb.c ++++ b/board/freescale/mpc8323erdb/mpc8323erdb.c +@@ -15,7 +15,7 @@ + #include <i2c.h> + #include <miiphy.h> + #include <command.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #if defined(CONFIG_PCI) + #include <pci.h> + #endif +diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c +index adf425486e1e..9da9a1ef7b5c 100644 +--- a/board/freescale/mpc832xemds/mpc832xemds.c ++++ b/board/freescale/mpc832xemds/mpc832xemds.c +@@ -17,7 +17,7 @@ + #endif + #include <asm/mmu.h> + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #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 02b5040ef4af..af1c3e72fcb4 100644 +--- a/board/freescale/mpc8349emds/mpc8349emds.c ++++ b/board/freescale/mpc8349emds/mpc8349emds.c +@@ -19,7 +19,7 @@ + #endif + + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #endif + + int fixed_sdram(void); +diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c +index 22a1d99c8846..fd2ce7218e59 100644 +--- a/board/freescale/mpc8349itx/mpc8349itx.c ++++ b/board/freescale/mpc8349itx/mpc8349itx.c +@@ -17,7 +17,7 @@ + #include <spd_sdram.h> + #include <asm/mmu.h> + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #endif + + #ifndef CONFIG_SPD_EEPROM +diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c +index 045841d57ba1..6dd139e8621f 100644 +--- a/board/freescale/mpc837xemds/mpc837xemds.c ++++ b/board/freescale/mpc837xemds/mpc837xemds.c +@@ -12,7 +12,7 @@ + #include <asm/fsl_mpc83xx_serdes.h> + #include <spd_sdram.h> + #include <tsec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_esdhc.h> + #include <fsl_mdio.h> +diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c +index cede1da634e7..51cb63760604 100644 +--- a/board/freescale/mpc8536ds/mpc8536ds.c ++++ b/board/freescale/mpc8536ds/mpc8536ds.c +@@ -17,7 +17,7 @@ + #include <asm/fsl_serdes.h> + #include <spd.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <spd_sdram.h> + #include <fdt_support.h> + #include <fsl_mdio.h> +diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c +index 1069e2c8c86b..2ad79e2d605f 100644 +--- a/board/freescale/mpc8540ads/mpc8540ads.c ++++ b/board/freescale/mpc8540ads/mpc8540ads.c +@@ -15,7 +15,7 @@ + #include <asm/mmu.h> + #include <asm/immap_85xx.h> + #include <fsl_ddr_sdram.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + #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 7b264dddd157..33ced17a64b4 100644 +--- a/board/freescale/mpc8541cds/mpc8541cds.c ++++ b/board/freescale/mpc8541cds/mpc8541cds.c +@@ -14,7 +14,7 @@ + #include <fsl_ddr_sdram.h> + #include <ioports.h> + #include <spd_sdram.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + #include "../common/cadmus.h" +diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c +index 66fb228a9089..a283365ba7c6 100644 +--- a/board/freescale/mpc8544ds/mpc8544ds.c ++++ b/board/freescale/mpc8544ds/mpc8544ds.c +@@ -15,7 +15,7 @@ + #include <asm/fsl_serdes.h> + #include <asm/io.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c +index de76d36174a0..7574b1d4a015 100644 +--- a/board/freescale/mpc8548cds/mpc8548cds.c ++++ b/board/freescale/mpc8548cds/mpc8548cds.c +@@ -15,7 +15,7 @@ + #include <fsl_ddr_sdram.h> + #include <asm/fsl_serdes.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <tsec.h> + #include <fsl_mdio.h> +diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c +index de5f5669e62f..9c74bfdd1d7e 100644 +--- a/board/freescale/mpc8555cds/mpc8555cds.c ++++ b/board/freescale/mpc8555cds/mpc8555cds.c +@@ -12,7 +12,7 @@ + #include <fsl_ddr_sdram.h> + #include <ioports.h> + #include <spd_sdram.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + #include "../common/cadmus.h" +diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c +index f99d639b2fbf..a603c2f67f26 100644 +--- a/board/freescale/mpc8560ads/mpc8560ads.c ++++ b/board/freescale/mpc8560ads/mpc8560ads.c +@@ -18,7 +18,7 @@ + #include <ioports.h> + #include <spd_sdram.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_lbc.h> + +diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c +index a5c5d9dd1aca..4ad427089955 100644 +--- a/board/freescale/mpc8568mds/mpc8568mds.c ++++ b/board/freescale/mpc8568mds/mpc8568mds.c +@@ -17,7 +17,7 @@ + #include <spd_sdram.h> + #include <i2c.h> + #include <ioports.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + #include "bcsr.h" +diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c +index 122490c026ed..8e72864becfc 100644 +--- a/board/freescale/mpc8569mds/mpc8569mds.c ++++ b/board/freescale/mpc8569mds/mpc8569mds.c +@@ -21,7 +21,7 @@ + #include <spd_sdram.h> + #include <i2c.h> + #include <ioports.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_esdhc.h> + #include <phy.h> +diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c +index ed6836a93027..5ce43a126c0b 100644 +--- a/board/freescale/mpc8572ds/mpc8572ds.c ++++ b/board/freescale/mpc8572ds/mpc8572ds.c +@@ -16,7 +16,7 @@ + #include <asm/io.h> + #include <asm/fsl_serdes.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <tsec.h> + #include <fsl_mdio.h> +diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c +index 95e398c9f495..ea3fe163d67d 100644 +--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c ++++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c +@@ -14,7 +14,7 @@ + #include <asm/fsl_serdes.h> + #include <i2c.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <spd_sdram.h> + #include <netdev.h> +diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c +index 94633b5c99dc..1d3fe29b2767 100644 +--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c ++++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c +@@ -12,7 +12,7 @@ + #include <fsl_ddr_sdram.h> + #include <asm/fsl_serdes.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <netdev.h> + +diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c +index 80a77892c9a1..772a11a94321 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 <spl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #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 96c0e8cfc71c..150c0b534dd0 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 <spl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + 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 0460cd9257b1..9bc65f3076f2 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 <libfdt.h> ++#include <linux/libfdt.h> + #include <spl.h> + #include <asm/arch/mx6-ddr.h> + +diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +index b28ce1049589..7e0faa8b1bf7 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 <libfdt.h> ++#include <linux/libfdt.h> + #include <spl.h> + #include <asm/arch/mx6-ddr.h> + +diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c +index 65bb575a9643..377654f9b438 100644 +--- a/board/freescale/p1010rdb/p1010rdb.c ++++ b/board/freescale/p1010rdb/p1010rdb.c +@@ -11,7 +11,7 @@ + #include <asm/immap_85xx.h> + #include <asm/io.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c +index 345feac0b294..6b280600aae9 100644 +--- a/board/freescale/p1022ds/p1022ds.c ++++ b/board/freescale/p1022ds/p1022ds.c +@@ -17,7 +17,7 @@ + #include <fsl_ddr_sdram.h> + #include <asm/fsl_serdes.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c +index 04517226033d..17aad34f34df 100644 +--- a/board/freescale/p1023rdb/p1023rdb.c ++++ b/board/freescale/p1023rdb/p1023rdb.c +@@ -18,7 +18,7 @@ + #include <asm/fsl_pci.h> + #include <fsl_ddr_sdram.h> + #include <asm/fsl_portals.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <netdev.h> + #include <malloc.h> +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 51217c58e578..f3309a226355 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 <asm/fsl_lbc.h> + #include <asm/mp.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c +index f54a6ff8dc72..d1e5e8190b0f 100644 +--- a/board/freescale/p1_twr/p1_twr.c ++++ b/board/freescale/p1_twr/p1_twr.c +@@ -20,7 +20,7 @@ + #include <asm/fsl_lbc.h> + #include <asm/mp.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c +index 6cb5692eda6e..5d6e640e55bb 100644 +--- a/board/freescale/qemu-ppce500/qemu-ppce500.c ++++ b/board/freescale/qemu-ppce500/qemu-ppce500.c +@@ -11,7 +11,7 @@ + #include <asm/mmu.h> + #include <asm/fsl_pci.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <netdev.h> + #include <fdtdec.h> +diff --git a/board/freescale/t102xqds/pci.c b/board/freescale/t102xqds/pci.c +index 736928961852..5ece77993d21 100644 +--- a/board/freescale/t102xqds/pci.c ++++ b/board/freescale/t102xqds/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c +index ba7041af9570..f13d41c77d92 100644 +--- a/board/freescale/t102xrdb/pci.c ++++ b/board/freescale/t102xrdb/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/t1040qds/pci.c b/board/freescale/t1040qds/pci.c +index c53e3b76a458..68ee74b785c0 100644 +--- a/board/freescale/t1040qds/pci.c ++++ b/board/freescale/t1040qds/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c +index c53e3b76a458..68ee74b785c0 100644 +--- a/board/freescale/t104xrdb/pci.c ++++ b/board/freescale/t104xrdb/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c +index 84a89dad4f29..5a6731c12bcf 100644 +--- a/board/freescale/t208xqds/pci.c ++++ b/board/freescale/t208xqds/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c +index ba7041af9570..f13d41c77d92 100644 +--- a/board/freescale/t208xrdb/pci.c ++++ b/board/freescale/t208xrdb/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/t4qds/pci.c b/board/freescale/t4qds/pci.c +index 08d74b444ad2..398c62bc48fd 100644 +--- a/board/freescale/t4qds/pci.c ++++ b/board/freescale/t4qds/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c +index 6387a20caece..36cff0dac4cf 100644 +--- a/board/freescale/t4rdb/pci.c ++++ b/board/freescale/t4rdb/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/gdsys/405ex/io64.c b/board/gdsys/405ex/io64.c +index 0a7baaa9dbce..be8fc3c6b99d 100644 +--- a/board/gdsys/405ex/io64.c ++++ b/board/gdsys/405ex/io64.c +@@ -11,7 +11,7 @@ + #include <common.h> + #include <asm/ppc4xx.h> + #include <asm/ppc405.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/processor.h> + #include <asm/io.h> +diff --git a/board/gdsys/intip/intip.c b/board/gdsys/intip/intip.c +index 2d7d789b23b3..f65eceae013b 100644 +--- a/board/gdsys/intip/intip.c ++++ b/board/gdsys/intip/intip.c +@@ -11,7 +11,7 @@ + + #include <common.h> + #include <asm/ppc440.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <i2c.h> + #include <asm/processor.h> +diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c +index c6566e9196ca..741bc47cb108 100644 +--- a/board/gdsys/mpc8308/hrcon.c ++++ b/board/gdsys/mpc8308/hrcon.c +@@ -9,7 +9,7 @@ + #include <hwconfig.h> + #include <i2c.h> + #include <spi.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <pci.h> + #include <mpc83xx.h> +diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c +index 34e9d1956e2e..21a64f2ad5f2 100644 +--- a/board/gdsys/mpc8308/strider.c ++++ b/board/gdsys/mpc8308/strider.c +@@ -9,7 +9,7 @@ + #include <hwconfig.h> + #include <i2c.h> + #include <spi.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <pci.h> + #include <mpc83xx.h> +diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c +index 01064dcfde10..8035284a3359 100644 +--- a/board/gdsys/p1022/controlcenterd.c ++++ b/board/gdsys/p1022/controlcenterd.c +@@ -32,7 +32,7 @@ + #include <fsl_ddr_sdram.h> + #include <asm/fsl_serdes.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_mdio.h> + #include <tsec.h> +diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c +index e7838dcd2a6e..50016c26940d 100644 +--- a/board/ids/ids8313/ids8313.c ++++ b/board/ids/ids8313/ids8313.c +@@ -15,7 +15,7 @@ + #include <common.h> + #include <mpc83xx.h> + #include <spi.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + DECLARE_GLOBAL_DATA_PTR; + /** CPLD contains the info about: +diff --git a/board/ifm/o2dnt2/o2dnt2.c b/board/ifm/o2dnt2/o2dnt2.c +index 4fc6809ad612..d21860fe6d42 100644 +--- a/board/ifm/o2dnt2/o2dnt2.c ++++ b/board/ifm/o2dnt2/o2dnt2.c +@@ -13,7 +13,7 @@ + #include <mpc5xxx.h> + #include <asm/processor.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <i2c.h> + #include <miiphy.h> +diff --git a/board/intercontrol/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c +index 05d673dc89b3..72aae3d88c50 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 <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <i2c.h> + #include <mb862xx.h> +diff --git a/board/ipek01/ipek01.c b/board/ipek01/ipek01.c +index 2e62355c4838..67a15395110b 100644 +--- a/board/ipek01/ipek01.c ++++ b/board/ipek01/ipek01.c +@@ -19,7 +19,7 @@ + #include <pci.h> + #include <netdev.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <mb862xx.h> + #include <video_fb.h> + #include <asm/processor.h> +diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c +index d56902bcd23c..5639f94e2164 100644 +--- a/board/jupiter/jupiter.c ++++ b/board/jupiter/jupiter.c +@@ -12,7 +12,7 @@ + #include <mpc5xxx.h> + #include <pci.h> + #include <asm/processor.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #define SDRAM_DDR 0 + #if 1 +diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c +index c2a7a5f99577..63712a8a9dc4 100644 +--- a/board/keymile/km82xx/km82xx.c ++++ b/board/keymile/km82xx/km82xx.c +@@ -11,7 +11,7 @@ + #include <malloc.h> + #include <asm/io.h> + +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <i2c.h> + #include "../common/common.h" + +diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c +index 154f97457b4d..a4d432de67e1 100644 +--- a/board/keymile/km83xx/km83xx.c ++++ b/board/keymile/km83xx/km83xx.c +@@ -23,7 +23,7 @@ + #include <asm/mmu.h> + #include <asm/processor.h> + #include <pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <post.h> + + #include "../common/common.h" +diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c +index b827e43a7a04..b2c3679719b3 100644 +--- a/board/keymile/kmp204x/pci.c ++++ b/board/keymile/kmp204x/pci.c +@@ -11,7 +11,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + #include <linux/errno.h> +diff --git a/board/mosaixtech/icon/icon.c b/board/mosaixtech/icon/icon.c +index 7558234abf1a..fdc7d8f189eb 100644 +--- a/board/mosaixtech/icon/icon.c ++++ b/board/mosaixtech/icon/icon.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <asm/ppc4xx.h> + #include <i2c.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <netdev.h> + #include <video.h> +diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c +index dc237c1cedaf..6440aef929d3 100644 +--- a/board/motionpro/motionpro.c ++++ b/board/motionpro/motionpro.c +@@ -13,7 +13,7 @@ + #include <common.h> + #include <mpc5xxx.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #if defined(CONFIG_STATUS_LED) + #include <status_led.h> +diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c +index 234a38780184..e96645f82dc5 100644 +--- a/board/mpc8308_p1m/mpc8308_p1m.c ++++ b/board/mpc8308_p1m/mpc8308_p1m.c +@@ -7,7 +7,7 @@ + + #include <common.h> + #include <i2c.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <pci.h> + #include <mpc83xx.h> +diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c +index c3607daf4605..c1718d7ae033 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 <spl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + 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 72786d2ace65..227b5a18743e 100644 +--- a/board/sbc8349/sbc8349.c ++++ b/board/sbc8349/sbc8349.c +@@ -16,7 +16,7 @@ + #include <spd_sdram.h> + #include <miiphy.h> + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #endif + + int fixed_sdram(void); +diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c +index 25329e44736e..1a48a6c89f24 100644 +--- a/board/sbc8548/sbc8548.c ++++ b/board/sbc8548/sbc8548.c +@@ -21,7 +21,7 @@ + #include <netdev.h> + #include <tsec.h> + #include <miiphy.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + DECLARE_GLOBAL_DATA_PTR; +diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c +index 6bdf1a28e97b..e7310afdc841 100644 +--- a/board/sbc8641d/sbc8641d.c ++++ b/board/sbc8641d/sbc8641d.c +@@ -20,7 +20,7 @@ + #include <asm/fsl_pci.h> + #include <fsl_ddr_sdram.h> + #include <asm/fsl_serdes.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + long int fixed_sdram (void); +diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c +index 8b34a80e8f72..11f21393792e 100644 +--- a/board/socrates/socrates.c ++++ b/board/socrates/socrates.c +@@ -17,7 +17,7 @@ + #include <asm/immap_85xx.h> + #include <ioports.h> + #include <flash.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/io.h> + #include <i2c.h> +diff --git a/board/sunxi/board.c b/board/sunxi/board.c +index 53656383d512..4d39190f8c79 100644 +--- a/board/sunxi/board.c ++++ b/board/sunxi/board.c +@@ -29,7 +29,7 @@ + #include <asm/io.h> + #include <crc.h> + #include <environment.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <nand.h> + #include <net.h> + #include <sy8106a.h> +diff --git a/board/t3corp/t3corp.c b/board/t3corp/t3corp.c +index 586c6f9a62b6..bf596ca244c0 100644 +--- a/board/t3corp/t3corp.c ++++ b/board/t3corp/t3corp.c +@@ -7,7 +7,7 @@ + + #include <common.h> + #include <asm/ppc440.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <i2c.h> + #include <mtd/cfi_flash.h> +diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c +index 09bebeb71b01..23e2ec81c72f 100644 +--- a/board/toradex/apalis_imx6/apalis_imx6.c ++++ b/board/toradex/apalis_imx6/apalis_imx6.c +@@ -936,7 +936,7 @@ void ldo_mode_set(int ldo_bypass) + + #ifdef CONFIG_SPL_BUILD + #include <spl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #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 d070677054b1..d958e9a72758 100644 +--- a/board/toradex/colibri_imx6/colibri_imx6.c ++++ b/board/toradex/colibri_imx6/colibri_imx6.c +@@ -740,7 +740,7 @@ void ldo_mode_set(int ldo_bypass) + + #ifdef CONFIG_SPL_BUILD + #include <spl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #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 2c6fc409c109..b4c6a0a1e848 100644 +--- a/board/toradex/common/tdx-common.c ++++ b/board/toradex/common/tdx-common.c +@@ -6,7 +6,7 @@ + + #include <common.h> + #include <g_dnl.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #include "tdx-cfg-block.h" + #include "tdx-common.h" +diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c +index fef9d2b29a94..b5dffa1cedad 100644 +--- a/board/tqc/tqm5200/tqm5200.c ++++ b/board/tqc/tqm5200/tqm5200.c +@@ -16,7 +16,7 @@ + #include <mpc5xxx.h> + #include <pci.h> + #include <asm/processor.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <netdev.h> + #include <video.h> + +diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c +index 6d17830575f4..e5f3608bfa0d 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 <libfdt.h> ++#include <linux/libfdt.h> + #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 c8fc95d52bc9..fbcfc0b23a1c 100644 +--- a/board/tqc/tqma6/tqma6.c ++++ b/board/tqc/tqma6/tqma6.c +@@ -20,7 +20,7 @@ + #include <asm/imx-common/spi.h> + #include <common.h> + #include <fsl_esdhc.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <i2c.h> + #include <mmc.h> + #include <power/pfuze100_pmic.h> +diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c +index 4db1a0bb7d04..a34acb851a55 100644 +--- a/board/tqc/tqma6/tqma6_mba6.c ++++ b/board/tqc/tqma6/tqma6_mba6.c +@@ -20,7 +20,7 @@ + + #include <common.h> + #include <fsl_esdhc.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <i2c.h> + #include <micrel.h> +diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c +index 2bbb614e4fe9..7ee6861f895d 100644 +--- a/board/tqc/tqma6/tqma6_wru4.c ++++ b/board/tqc/tqma6/tqma6_wru4.c +@@ -23,7 +23,7 @@ + + #include <common.h> + #include <fsl_esdhc.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <i2c.h> + #include <micrel.h> +diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c +index 530c45f600f2..56140c81ae97 100644 +--- a/board/udoo/neo/neo.c ++++ b/board/udoo/neo/neo.c +@@ -445,7 +445,7 @@ int board_late_init(void) + + #ifdef CONFIG_SPL_BUILD + +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <asm/arch/mx6-ddr.h> + + static const struct mx6sx_iomux_ddr_regs mx6_ddr_ioregs = { +diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c +index 4780e8c147a3..1853b197e7ba 100644 +--- a/board/varisys/cyrus/pci.c ++++ b/board/varisys/cyrus/pci.c +@@ -8,7 +8,7 @@ + #include <command.h> + #include <pci.h> + #include <asm/fsl_pci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <asm/fsl_serdes.h> + +diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c +index 7f24a30688ac..18a6c83e5883 100644 +--- a/board/ve8313/ve8313.c ++++ b/board/ve8313/ve8313.c +@@ -10,7 +10,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <pci.h> + #include <mpc83xx.h> + #include <ns16550.h> +diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c +index d3b1f1564f3c..6c0813ba001a 100644 +--- a/board/vscom/baltos/board.c ++++ b/board/vscom/baltos/board.c +@@ -10,7 +10,7 @@ + + #include <common.h> + #include <errno.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <spl.h> + #include <asm/arch/cpu.h> + #include <asm/arch/hardware.h> +diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c +index 62375717f091..45924cdb4896 100644 +--- a/board/xes/common/fsl_8xxx_pci.c ++++ b/board/xes/common/fsl_8xxx_pci.c +@@ -11,7 +11,7 @@ + #include <asm/fsl_serdes.h> + #include <asm/io.h> + #include <linux/compiler.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + +diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c +index 6a3df52391e7..4b3a46c8cbfd 100644 +--- a/board/xes/xpedite520x/xpedite520x.c ++++ b/board/xes/xpedite520x/xpedite520x.c +@@ -14,7 +14,7 @@ + #include <asm/io.h> + #include <asm/cache.h> + #include <asm/mmu.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <pca953x.h> + +diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c +index 41419feb178a..ae606f5ba708 100644 +--- a/board/xes/xpedite537x/xpedite537x.c ++++ b/board/xes/xpedite537x/xpedite537x.c +@@ -12,7 +12,7 @@ + #include <asm/fsl_pci.h> + #include <asm/io.h> + #include <asm/cache.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <pca953x.h> + +diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c +index 1f05150d0ff2..c90bb89dae0c 100644 +--- a/board/xes/xpedite550x/xpedite550x.c ++++ b/board/xes/xpedite550x/xpedite550x.c +@@ -12,7 +12,7 @@ + #include <asm/fsl_pci.h> + #include <asm/io.h> + #include <asm/cache.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <pca953x.h> + +diff --git a/cmd/bootefi.c b/cmd/bootefi.c +index 97a0fc9c7ca3..845cb991a113 100644 +--- a/cmd/bootefi.c ++++ b/cmd/bootefi.c +@@ -11,8 +11,8 @@ + #include <dm/device.h> + #include <efi_loader.h> + #include <errno.h> +-#include <libfdt.h> +-#include <libfdt_env.h> ++#include <linux/libfdt.h> ++#include <linux/libfdt_env.h> + #include <memalign.h> + #include <asm/global_data.h> + #include <asm-generic/sections.h> +diff --git a/cmd/fdt.c b/cmd/fdt.c +index 8bd345afa8a1..d82a03b6d7ad 100644 +--- a/cmd/fdt.c ++++ b/cmd/fdt.c +@@ -13,7 +13,7 @@ + #include <linux/ctype.h> + #include <linux/types.h> + #include <asm/global_data.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <mapmem.h> + #include <asm/io.h> +diff --git a/common/board_info.c b/common/board_info.c +index aa45e24b3460..16cf966233ed 100644 +--- a/common/board_info.c ++++ b/common/board_info.c +@@ -3,7 +3,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <linux/compiler.h> + + int __weak checkboard(void) +diff --git a/common/bootm_os.c b/common/bootm_os.c +index e3f5a4641207..c2018a135d85 100644 +--- a/common/bootm_os.c ++++ b/common/bootm_os.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <bootm.h> + #include <fdt_support.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <vxworks.h> + +diff --git a/common/bootstage.c b/common/bootstage.c +index 35bce3d881a5..800645ed8fdf 100644 +--- a/common/bootstage.c ++++ b/common/bootstage.c +@@ -13,7 +13,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <linux/compiler.h> + +diff --git a/common/fdt_support.c b/common/fdt_support.c +index c9f7019e38e8..6f83bfa2b43a 100644 +--- a/common/fdt_support.c ++++ b/common/fdt_support.c +@@ -13,7 +13,7 @@ + #include <linux/ctype.h> + #include <linux/types.h> + #include <asm/global_data.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <exports.h> + #include <fdtdec.h> +diff --git a/common/image-fdt.c b/common/image-fdt.c +index e7540be8d631..49e3125f0b8c 100644 +--- a/common/image-fdt.c ++++ b/common/image-fdt.c +@@ -13,7 +13,7 @@ + #include <fdt_support.h> + #include <errno.h> + #include <image.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <mapmem.h> + #include <asm/io.h> + +diff --git a/common/image.c b/common/image.c +index 8c35327745ba..7bbec78823b9 100644 +--- a/common/image.c ++++ b/common/image.c +@@ -30,7 +30,7 @@ + #include <mapmem.h> + + #if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fpga.h> + #include <xilinx.h> +@@ -862,7 +862,7 @@ ulong genimg_get_kernel_addr(char * const img_addr) + * + * New uImage format and FDT blob are based on a libfdt. FDT blob + * may be passed directly or embedded in a FIT image. In both situations +- * genimg_get_format() must be able to dectect libfdt header. ++ * genimg_get_format() must be able to dectect linux/libfdt.header. + * + * returns: + * image format type or IMAGE_FORMAT_INVALID if no image is present +diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c +index 2ba00f6d34c0..5ec3ece900de 100644 +--- a/common/lcd_simplefb.c ++++ b/common/lcd_simplefb.c +@@ -10,7 +10,7 @@ + #include <common.h> + #include <lcd.h> + #include <fdt_support.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + DECLARE_GLOBAL_DATA_PTR; + +diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c +index a14acceebb3d..c884402b24b8 100644 +--- a/common/spl/spl_fat.c ++++ b/common/spl/spl_fat.c +@@ -15,7 +15,7 @@ + #include <fat.h> + #include <errno.h> + #include <image.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + static int fat_registered; + +diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c +index aae556f97dfd..8ab600887ee9 100644 +--- a/common/spl/spl_fit.c ++++ b/common/spl/spl_fit.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <errno.h> + #include <image.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <spl.h> + + 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 cd39f9be9d3c..d07598537450 100644 +--- a/common/spl/spl_nand.c ++++ b/common/spl/spl_nand.c +@@ -9,7 +9,7 @@ + #include <spl.h> + #include <asm/io.h> + #include <nand.h> +-#include <libfdt_env.h> ++#include <linux/libfdt_env.h> + #include <fdt.h> + + #if defined(CONFIG_SPL_NAND_RAW_ONLY) +diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c +index ff8085b795e6..4ab3dcd624d4 100644 +--- a/common/spl/spl_ymodem.c ++++ b/common/spl/spl_ymodem.c +@@ -14,7 +14,7 @@ + #include <xyzModem.h> + #include <asm/u-boot.h> + #include <asm/utils.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #define BUF_SIZE 1024 + +diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c +index c68bcba54f1e..b7e72fd16484 100644 +--- a/drivers/core/regmap.c ++++ b/drivers/core/regmap.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <dm.h> + #include <errno.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <mapmem.h> + #include <regmap.h> +diff --git a/drivers/core/root.c b/drivers/core/root.c +index 9edfc1efb661..1cc2a72be3ff 100644 +--- a/drivers/core/root.c ++++ b/drivers/core/root.c +@@ -11,7 +11,7 @@ + #include <errno.h> + #include <fdtdec.h> + #include <malloc.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <dm/device.h> + #include <dm/device-internal.h> + #include <dm/lists.h> +diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c +index 0940faf768cc..470e662d8e3e 100644 +--- a/drivers/crypto/fsl/sec.c ++++ b/drivers/crypto/fsl/sec.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #if CONFIG_SYS_FSL_SEC_COMPAT == 2 || CONFIG_SYS_FSL_SEC_COMPAT >= 4 + #include <fsl_sec.h> +diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c +index c440399a09cf..01d2455e5201 100644 +--- a/drivers/mmc/exynos_dw_mmc.c ++++ b/drivers/mmc/exynos_dw_mmc.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <dwmmc.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <errno.h> + #include <asm/arch/dwmmc.h> +diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c +index c56e1a3a1c5b..bbf815adb419 100644 +--- a/drivers/mmc/rockchip_sdhci.c ++++ b/drivers/mmc/rockchip_sdhci.c +@@ -9,7 +9,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <sdhci.h> + +diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c +index ac737e0f0f26..917b4ca7db29 100644 +--- a/drivers/mmc/s5p_sdhci.c ++++ b/drivers/mmc/s5p_sdhci.c +@@ -10,7 +10,7 @@ + #include <malloc.h> + #include <sdhci.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <asm/gpio.h> + #include <asm/arch/mmc.h> + #include <asm/arch/clk.h> +diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c +index 0a22e582957f..0585e627cb10 100644 +--- a/drivers/mmc/socfpga_dw_mmc.c ++++ b/drivers/mmc/socfpga_dw_mmc.c +@@ -11,7 +11,7 @@ + #include <dwmmc.h> + #include <errno.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <linux/err.h> + #include <malloc.h> + +diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c +index 3da138562ab9..72bf9f102eda 100644 +--- a/drivers/mmc/zynq_sdhci.c ++++ b/drivers/mmc/zynq_sdhci.c +@@ -9,7 +9,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <sdhci.h> + +diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c +index 46b8a6bc6991..2c18d582a699 100644 +--- a/drivers/net/fsl-mc/mc.c ++++ b/drivers/net/fsl-mc/mc.c +@@ -7,7 +7,7 @@ + #include <errno.h> + #include <linux/bug.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl-mc/fsl_mc.h> + #include <fsl-mc/fsl_mc_sys.h> +diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c +index 52792dcd5973..4ca743e65036 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 <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + 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 0f8e3c9fcbdc..dcea1924182d 100644 +--- a/drivers/pci/pci-emul-uclass.c ++++ b/drivers/pci/pci-emul-uclass.c +@@ -8,7 +8,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <pci.h> + #include <dm/lists.h> + +diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c +index 2e6b986dbce1..763121114517 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 <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + + 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 d48e1e6fe651..bce8b79b68f1 100644 +--- a/drivers/pci/tsi108_pci.c ++++ b/drivers/pci/tsi108_pci.c +@@ -16,7 +16,7 @@ + #include <asm/io.h> + #include <tsi108.h> + #if defined(CONFIG_OF_LIBFDT) +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #endif + +diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c +index 02ab9b4afde6..1a492a387a9c 100644 +--- a/drivers/pinctrl/pinctrl-uclass.c ++++ b/drivers/pinctrl/pinctrl-uclass.c +@@ -5,7 +5,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <linux/err.h> + #include <linux/list.h> + #include <dm/device.h> +diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c +index e8164bfd08af..5c44c07adf83 100644 +--- a/drivers/power/pmic/act8846.c ++++ b/drivers/power/pmic/act8846.c +@@ -9,7 +9,7 @@ + #include <dm.h> + #include <errno.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <power/act8846_pmic.h> + #include <power/pmic.h> + +diff --git a/drivers/power/pmic/rk808.c b/drivers/power/pmic/rk808.c +index 770f471672e8..e53fbd8c5634 100644 +--- a/drivers/power/pmic/rk808.c ++++ b/drivers/power/pmic/rk808.c +@@ -9,7 +9,7 @@ + #include <dm.h> + #include <errno.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <power/rk808_pmic.h> + #include <power/pmic.h> + +diff --git a/drivers/power/pmic/rn5t567.c b/drivers/power/pmic/rn5t567.c +index 001e69553e8a..9e5b0b119b13 100644 +--- a/drivers/power/pmic/rn5t567.c ++++ b/drivers/power/pmic/rn5t567.c +@@ -9,7 +9,7 @@ + #include <dm.h> + #include <errno.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <power/rn5t567_pmic.h> + #include <power/pmic.h> + +diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c +index b0a4c5da6d80..bc45e63b3106 100644 +--- a/drivers/power/regulator/pwm_regulator.c ++++ b/drivers/power/regulator/pwm_regulator.c +@@ -13,7 +13,7 @@ + #include <errno.h> + #include <pwm.h> + #include <power/regulator.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fdtdec.h> + +diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c +index 4f48f984ab58..9bbdc60353ba 100644 +--- a/drivers/qe/fdt.c ++++ b/drivers/qe/fdt.c +@@ -8,7 +8,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fsl_qe.h> + +diff --git a/drivers/sound/sound-i2s.c b/drivers/sound/sound-i2s.c +index 749bbbd0318b..be69fb0b010b 100644 +--- a/drivers/sound/sound-i2s.c ++++ b/drivers/sound/sound-i2s.c +@@ -8,7 +8,7 @@ + #include <malloc.h> + #include <common.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdtdec.h> + #include <i2c.h> + #include <i2s.h> +diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c +index 35c2dc18d955..1b99d4810d02 100644 +--- a/drivers/usb/common/common.c ++++ b/drivers/usb/common/common.c +@@ -8,7 +8,7 @@ + */ + + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <linux/usb/otg.h> + + DECLARE_GLOBAL_DATA_PTR; +diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c +index 53281d78b35f..b3e693c6966a 100644 +--- a/drivers/usb/host/ehci-exynos.c ++++ b/drivers/usb/host/ehci-exynos.c +@@ -10,7 +10,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <usb.h> + #include <asm/arch/cpu.h> +diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c +index 6484c1c33440..5d31ad846369 100644 +--- a/drivers/usb/host/ehci-msm.c ++++ b/drivers/usb/host/ehci-msm.c +@@ -12,7 +12,7 @@ + #include <dm.h> + #include <errno.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <usb.h> + #include <usb/ehci-ci.h> + #include <usb/ulpi.h> +diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c +index e3620da15fb1..ad61be7c9552 100644 +--- a/drivers/usb/host/ehci-tegra.c ++++ b/drivers/usb/host/ehci-tegra.c +@@ -16,7 +16,7 @@ + #include <asm/arch-tegra/clk_rst.h> + #include <usb.h> + #include <usb/ulpi.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdtdec.h> + + #include "ehci.h" +diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c +index f389bff1718f..b86661c6fb01 100644 +--- a/drivers/usb/host/ehci-vf.c ++++ b/drivers/usb/host/ehci-vf.c +@@ -20,7 +20,7 @@ + #include <asm/imx-common/iomux-v3.h> + #include <asm/imx-common/regs-usbphy.h> + #include <usb/ehci-ci.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdtdec.h> + + #include "ehci.h" +diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c +index 82fcd84ef2f2..8b0b5bf86e97 100644 +--- a/drivers/usb/host/xhci-exynos5.c ++++ b/drivers/usb/host/xhci-exynos5.c +@@ -16,7 +16,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <usb.h> + #include <watchdog.h> +diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c +index 8cbcb8f923e0..34996bea6954 100644 +--- a/drivers/usb/host/xhci-rockchip.c ++++ b/drivers/usb/host/xhci-rockchip.c +@@ -7,7 +7,7 @@ + #include <common.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <usb.h> + #include <watchdog.h> +diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c +index 1958478d6281..01bda15bd606 100644 +--- a/drivers/usb/phy/rockchip_usb2_phy.c ++++ b/drivers/usb/phy/rockchip_usb2_phy.c +@@ -6,7 +6,7 @@ + + #include <common.h> + #include <asm/io.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #include "../gadget/dwc2_udc_otg_priv.h" + +diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c +index fc39f2c5620b..d034f1e53b9f 100644 +--- a/drivers/video/exynos/exynos_dp.c ++++ b/drivers/video/exynos/exynos_dp.c +@@ -11,7 +11,7 @@ + #include <common.h> + #include <display.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <video_bridge.h> + #include <linux/compat.h> +diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c +index aae78a8159ca..f84dd7097f69 100644 +--- a/drivers/video/exynos/exynos_dp_lowlevel.c ++++ b/drivers/video/exynos/exynos_dp_lowlevel.c +@@ -13,7 +13,7 @@ + #include <asm/arch/dp_info.h> + #include <asm/arch/dp.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #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 5483d6613f76..0b7e74ae17a4 100644 +--- a/drivers/video/exynos/exynos_fb.c ++++ b/drivers/video/exynos/exynos_fb.c +@@ -13,7 +13,7 @@ + #include <div64.h> + #include <dm.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <panel.h> + #include <video.h> + #include <video_bridge.h> +diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c +index a5d9b5921868..724d08f7ae4a 100644 +--- a/drivers/video/exynos/exynos_mipi_dsi.c ++++ b/drivers/video/exynos/exynos_mipi_dsi.c +@@ -10,7 +10,7 @@ + #include <common.h> + #include <malloc.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <linux/compat.h> + #include <linux/err.h> + #include <asm/arch/dsim.h> +diff --git a/include/fdt_support.h b/include/fdt_support.h +index 955c12171331..471d6694991b 100644 +--- a/include/fdt_support.h ++++ b/include/fdt_support.h +@@ -10,7 +10,7 @@ + + #ifdef CONFIG_OF_LIBFDT + +-#include <libfdt.h> ++#include <linux/libfdt.h> + + 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 d074478f1415..90025987afdc 100644 +--- a/include/fdtdec.h ++++ b/include/fdtdec.h +@@ -14,7 +14,7 @@ + * changes to support FDT are minimized. + */ + +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <pci.h> + + /* +diff --git a/include/image.h b/include/image.h +index 05376783fb10..40943eac4b7f 100644 +--- a/include/image.h ++++ b/include/image.h +@@ -50,7 +50,7 @@ struct lmb; + + #if IMAGE_ENABLE_FIT + #include <hash.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + # 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 e2bc2e00c184..48476cd443f8 100644 +--- a/include/libfdt.h ++++ b/include/linux/libfdt.h +@@ -51,7 +51,7 @@ + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#include <libfdt_env.h> ++#include <linux/libfdt_env.h> + #include <fdt.h> + + #define FDT_FIRST_SUPPORTED_VERSION 0x10 +diff --git a/include/libfdt_env.h b/include/linux/libfdt_env.h +similarity index 94% +rename from include/libfdt_env.h +rename to include/linux/libfdt_env.h +index 6c6845f76cf7..7094a596b314 100644 +--- a/include/libfdt_env.h ++++ b/include/linux/libfdt_env.h +@@ -9,8 +9,8 @@ + #ifndef _LIBFDT_ENV_H + #define _LIBFDT_ENV_H + +-#include "compiler.h" +-#include "linux/types.h" ++#include "../compiler.h" ++#include "types.h" + + extern struct fdt_header *working_fdt; /* Pointer to the working fdt */ + +diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c +index 51080cbeed2f..6d54830dcb6e 100644 +--- a/lib/efi_loader/efi_boottime.c ++++ b/lib/efi_loader/efi_boottime.c +@@ -10,7 +10,7 @@ + #include <efi_loader.h> + #include <malloc.h> + #include <asm/global_data.h> +-#include <libfdt_env.h> ++#include <linux/libfdt_env.h> + #include <u-boot/crc.h> + #include <bootm.h> + #include <inttypes.h> +diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c +index 95aa590c8af7..a69a67465e41 100644 +--- a/lib/efi_loader/efi_memory.c ++++ b/lib/efi_loader/efi_memory.c +@@ -10,7 +10,7 @@ + #include <efi_loader.h> + #include <malloc.h> + #include <asm/global_data.h> +-#include <libfdt_env.h> ++#include <linux/libfdt_env.h> + #include <linux/list_sort.h> + #include <inttypes.h> + #include <watchdog.h> +diff --git a/lib/fdtdec.c b/lib/fdtdec.c +index 81f47ef2c7f4..a4f78246dfb9 100644 +--- a/lib/fdtdec.c ++++ b/lib/fdtdec.c +@@ -8,7 +8,7 @@ + #include <dm.h> + #include <errno.h> + #include <serial.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdt_support.h> + #include <fdtdec.h> + #include <asm/sections.h> +diff --git a/lib/fdtdec_common.c b/lib/fdtdec_common.c +index 63b704a3d719..656a6bf626a9 100644 +--- a/lib/fdtdec_common.c ++++ b/lib/fdtdec_common.c +@@ -10,10 +10,10 @@ + + #ifndef USE_HOSTCC + #include <common.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <fdtdec.h> + #else +-#include "libfdt.h" ++#include "linux/libfdt.h" + #include "fdt_support.h" + + #define debug(...) +diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c +index cc8b918f64da..c51ffd7ecf72 100644 +--- a/lib/fdtdec_test.c ++++ b/lib/fdtdec_test.c +@@ -8,7 +8,7 @@ + + #include <common.h> + #include <fdtdec.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include <malloc.h> + #include <os.h> + +diff --git a/lib/libfdt/fdt.c b/lib/libfdt/fdt.c +index 2055734012a1..2fdd92b34210 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 <libfdt_env.h> ++#include <linux/libfdt_env.h> + + #ifndef USE_HOSTCC + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #else + #include "fdt_host.h" + #endif +diff --git a/lib/libfdt/fdt_addresses.c b/lib/libfdt/fdt_addresses.c +index b6bc66ea3237..e1e7a5bac0db 100644 +--- a/lib/libfdt/fdt_addresses.c ++++ b/lib/libfdt/fdt_addresses.c +@@ -3,11 +3,11 @@ + * Copyright (C) 2014 David Gibson <david@gibson.dropbear.id.au> + * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause + */ +-#include <libfdt_env.h> ++#include <linux/libfdt_env.h> + + #ifndef USE_HOSTCC + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #else + #include "fdt_host.h" + #endif +diff --git a/lib/libfdt/fdt_empty_tree.c b/lib/libfdt/fdt_empty_tree.c +index 6fde1eb9eda0..e6ca82c1621c 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 <libfdt_env.h> ++#include <linux/libfdt_env.h> + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #include "libfdt_internal.h" + +diff --git a/lib/libfdt/fdt_overlay.c b/lib/libfdt/fdt_overlay.c +index bb4140412971..f819dc2a2cea 100644 +--- a/lib/libfdt/fdt_overlay.c ++++ b/lib/libfdt/fdt_overlay.c +@@ -1,7 +1,7 @@ +-#include "libfdt_env.h" ++#include "linux/libfdt_env.h" + + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #include "libfdt_internal.h" + +diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c +index d2ce4c1c537b..11d64a7267b7 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 <libfdt_env.h> ++#include <linux/libfdt_env.h> + + #ifndef USE_HOSTCC + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #else + #include "fdt_host.h" + #endif +diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c +index 1be9538fd277..d972d031c6ba 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 <libfdt_env.h> ++#include <linux/libfdt_env.h> + + #ifndef USE_HOSTCC + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #else + #include "fdt_host.h" + #endif +diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c +index 87d4030fb14d..708c15ccb987 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 <libfdt_env.h> ++#include <linux/libfdt_env.h> + + #ifndef USE_HOSTCC + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #else + #include "fdt_host.h" + #endif +diff --git a/lib/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c +index 7f8e02b1ee21..5475cf2ee597 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 <libfdt_env.h> ++#include <linux/libfdt_env.h> + + #ifndef USE_HOSTCC + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #else + #include "fdt_host.h" + #endif +diff --git a/lib/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c +index 70fd02655073..5fcd79377c20 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 <libfdt_env.h> ++#include <linux/libfdt_env.h> + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + + #include "libfdt_internal.h" + +diff --git a/lib/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c +index 45fb9641206f..cb8ee96f5a13 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 <libfdt_env.h> ++#include <linux/libfdt_env.h> + + #ifndef USE_HOSTCC + #include <fdt.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #else + #include "fdt_host.h" + #endif +diff --git a/lib/libfdt/libfdt.swig b/lib/libfdt/libfdt.swig +index b24c72b1a22b..58a3b2840180 100644 +--- a/lib/libfdt/libfdt.swig ++++ b/lib/libfdt/libfdt.swig +@@ -3,7 +3,7 @@ + + %{ + #define SWIG_FILE_WITH_INIT +-#include "libfdt.h" ++#include "linux/libfdt.h" + %} + + %pythoncode %{ +diff --git a/tools/Makefile b/tools/Makefile +index 5b81dde4b069..96bfbbe9c7e4 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 11050b66f710..a891d1c74746 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 <stdbool.h>\n') +- self.Out('#include <libfdt.h>\n') ++ self.Out('#include <linux/libfdt.h>\n') + + # Output the struct definition + for name in sorted(structs): +diff --git a/tools/fdt_host.h b/tools/fdt_host.h +index 134d9657139b..d8ea8de1ec33 100644 +--- a/tools/fdt_host.h ++++ b/tools/fdt_host.h +@@ -8,7 +8,7 @@ + #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" + + int fit_check_sign(const void *working_fdt, const void *key); +diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c +index b9078273c954..fbe38c824a41 100644 +--- a/tools/fdtgrep.c ++++ b/tools/fdtgrep.c +@@ -16,7 +16,7 @@ + #include <string.h> + #include <unistd.h> + +-#include <../include/libfdt.h> ++#include <../include/linux/libfdt.h> + #include <libfdt_internal.h> + + /* Define DEBUG to get some debugging output on stderr */ +diff --git a/tools/ifdtool.c b/tools/ifdtool.c +index 195b1533ab69..c805597744bd 100644 +--- a/tools/ifdtool.c ++++ b/tools/ifdtool.c +@@ -18,7 +18,7 @@ + #include <unistd.h> + #include <sys/types.h> + #include <sys/stat.h> +-#include <libfdt.h> ++#include <linux/libfdt.h> + #include "ifdtool.h" + + #undef DEBUG +-- +2.21.0 + diff --git a/package/boot/uboot-omap/patches/107-tools-include-necessary-headers-explicitly.patch b/package/boot/uboot-omap/patches/107-tools-include-necessary-headers-explicitly.patch new file mode 100644 index 0000000000..4d0f254747 --- /dev/null +++ b/package/boot/uboot-omap/patches/107-tools-include-necessary-headers-explicitly.patch @@ -0,0 +1,75 @@ +From ad23f45b346f196e07ba49d354a12762f19abfa4 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada <yamada.masahiro@socionext.com> +Date: Sun, 21 Jan 2018 19:19:15 +0900 +Subject: [PATCH 2/2] tools: include necessary headers explicitly + +Several host-tools use "bool" type without including <stdbool.h>. +This relies on the crappy header inclusion chain. + +tools/Makefile has the following line: + + HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ + +All host-tools are forced to include libfdt_env.h even if they are +totally unrelated to FDT. Then, <stdbool.h> is indirectly included +as follows: + + include/libfdt_env.h + -> include/linux/types.h + -> <stdbool.h> + +I am fixing this horrible crap. In advance, I need to add necessary +include directives explicitly. tools/fdtgrep.c needs more; <fctl.h> +for open() and <errno.h> for errno. + +Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> +Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> +Reviewed-by: Simon Glass <sjg@chromium.org> +--- + tools/fdtgrep.c | 3 +++ + tools/ifdtool.c | 1 + + tools/imagetool.h | 1 + + 3 files changed, 5 insertions(+) + +diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c +index fbe38c824a41..13703fc3b1b9 100644 +--- a/tools/fdtgrep.c ++++ b/tools/fdtgrep.c +@@ -10,7 +10,10 @@ + + #include <assert.h> + #include <ctype.h> ++#include <errno.h> + #include <getopt.h> ++#include <fcntl.h> ++#include <stdbool.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff --git a/tools/ifdtool.c b/tools/ifdtool.c +index c805597744bd..e4c2f82c4a1e 100644 +--- a/tools/ifdtool.c ++++ b/tools/ifdtool.c +@@ -12,6 +12,7 @@ + #include <assert.h> + #include <fcntl.h> + #include <getopt.h> ++#include <stdbool.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +diff --git a/tools/imagetool.h b/tools/imagetool.h +index 15c2a0c0e1c1..076e5e0dc8f9 100644 +--- a/tools/imagetool.h ++++ b/tools/imagetool.h +@@ -12,6 +12,7 @@ + #include "os_support.h" + #include <errno.h> + #include <fcntl.h> ++#include <stdbool.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-- +2.21.0 + |