From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>
Date: Tue, 06 Mar 2018 09:39:55 +0100 [thread overview]
Message-ID: <1520325595.2018.23.camel@bootlin.com> (raw)
In-Reply-To: <1520180411-12547-1-git-send-email-yamada.masahiro@socionext.com>
Hi,
On Mon, 2018-03-05 at 01:20 +0900, Masahiro Yamada wrote:
> Thomas reported U-Boot failed to build host tools if libfdt-devel
> package is installed because tools include libfdt headers from
> /usr/include/ instead of using internal ones.
Sorry for being late to the party here, but isn't this issue fixed by
the patch I sent a few days ago "tools: Include U-Boot libfdt headers
from their actual path": https://patchwork.ozlabs.org/patch/880924/ ?
I doubt we need to keep both changes here. What do you think?
> This commit moves the header code:
> include/libfdt.h -> include/linux/libfdt.h
> include/libfdt_env.h -> include/linux/libfdt_env.h
>
> and replaces include directives:
> #include <libfdt.h> -> #include <linux/libfdt.h>
> #include <libfdt_env.h> -> #include <linux/libfdt_env.h>
>
> Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> 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-imx/mx6/litesom.c | 2 +-
> arch/arm/mach-imx/mx6/opos6ul.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/am33xx/fdt.c | 2 +-
> arch/arm/mach-omap2/fdt-common.c | 2 +-
> arch/arm/mach-omap2/omap5/fdt.c | 2 +-
> arch/arm/mach-socfpga/misc.c | 2 +-
> arch/arm/mach-socfpga/misc_gen5.c | 2 +-
> arch/arm/mach-uniphier/board_late_init.c | 2 +-
> arch/arm/mach-uniphier/boards.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/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/armltd/vexpress/vexpress_tc2.c | 2 +-
> board/congatec/cgtqmx6eval/cgtqmx6eval.c | 2 +-
> board/el/el6x/el6x.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/ls1088a/ls1088a.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/mpc8541cds/mpc8541cds.c | 2 +-
> board/freescale/mpc8544ds/mpc8544ds.c | 2 +-
> board/freescale/mpc8548cds/mpc8548cds.c | 2 +-
> board/freescale/mpc8555cds/mpc8555cds.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/mx6sabreauto/mx6sabreauto.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/mpc8308/hrcon.c | 2 +-
> board/gdsys/mpc8308/strider.c | 2 +-
> board/gdsys/p1022/controlcenterd.c | 2 +-
> board/ids/ids8313/ids8313.c | 2 +-
> board/keymile/km83xx/km83xx.c | 2 +-
> board/keymile/kmp204x/pci.c | 2 +-
> board/liebherr/display5/spl.c | 2 +-
> board/mpc8308_p1m/mpc8308_p1m.c | 2 +-
> board/phytec/pcm058/pcm058.c | 2 +-
> board/phytec/pfla02/pfla02.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/toradex/apalis_imx6/apalis_imx6.c | 2 +-
> board/toradex/colibri_imx6/colibri_imx6.c | 2 +-
> board/toradex/common/tdx-common.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 +-
> cmd/spl.c | 2 +-
> common/board_info.c | 2 +-
> common/boot_fit.c | 2 +-
> common/bootm_os.c | 2 +-
> common/bootstage.c | 2 +-
> common/common_fit.c | 2 +-
> common/fdt_support.c | 2 +-
> common/image-fdt.c | 2 +-
> common/image.c | 2 +-
> common/lcd_simplefb.c | 2 +-
> common/spl/spl_fat.c | 2 +-
> common/spl/spl_fit.c | 2 +-
> common/spl/spl_nand.c | 2 +-
> common/spl/spl_net.c | 2 +-
> common/spl/spl_ram.c | 2 +-
> common/spl/spl_ymodem.c | 2 +-
> drivers/core/of_access.c | 2 +-
> drivers/core/of_addr.c | 2 +-
> drivers/core/of_extra.c | 2 +-
> drivers/core/ofnode.c | 2 +-
> drivers/core/regmap.c | 2 +-
> drivers/core/root.c | 2 +-
> drivers/core/util.c | 2 +-
> drivers/crypto/fsl/sec.c | 2 +-
> drivers/firmware/psci.c | 2 +-
> drivers/misc/fsl_portals.c | 2 +-
> drivers/mmc/exynos_dw_mmc.c | 2 +-
> drivers/mmc/rockchip_sdhci.c | 2 +-
> drivers/mmc/s5p_sdhci.c | 2 +-
> drivers/mmc/sdhci-cadence.c | 2 +-
> drivers/mmc/socfpga_dw_mmc.c | 2 +-
> drivers/mmc/stm32_sdmmc2.c | 2 +-
> drivers/mmc/xenon_sdhci.c | 2 +-
> drivers/mmc/zynq_sdhci.c | 2 +-
> drivers/mtd/spi/sunxi_spi_spl.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_fixup.c | 2 +-
> drivers/phy/sti_usb_phy.c | 2 +-
> drivers/pinctrl/pinctrl-single.c | 2 +-
> drivers/pinctrl/pinctrl-uclass.c | 2 +-
> drivers/power/pmic/act8846.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/dwc3-sti-glue.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/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/libfdt.h | 318 -----------
> -----------
> include/libfdt_env.h | 5 -
> include/linux/libfdt.h | 307
> +++++++++++++++++++++
> include/linux/libfdt_env.h | 9 +
> lib/efi_loader/efi_boottime.c | 2 +-
> lib/efi_loader/efi_memory.c | 2 +-
> lib/fdtdec.c | 2 +-
> lib/fdtdec_common.c | 2 +-
> lib/fdtdec_test.c | 2 +-
> lib/libfdt/Makefile | 2 +
> lib/libfdt/fdt_region.c | 4 +-
> lib/libfdt/fdt_ro.c | 4 +-
> lib/of_live.c | 2 +-
> tools/dtoc/dtb_platdata.py | 2 +-
> tools/dtoc/test_dtoc.py | 2 +-
> tools/fdt_host.h | 2 +-
> tools/ifdtool.c | 2 +-
> 197 files changed, 514 insertions(+), 519 deletions(-)
> delete mode 100644 include/libfdt.h
> delete mode 100644 include/libfdt_env.h
>
> diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c
> b/arch/arm/cpu/armv7/ls102xa/fdt.c
> index d21ad39..eb3e287 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 707dad4..204187c 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 80af318..99c5d13 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 ec1c9b8..195901a 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 8974065..cfc236f 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -19,7 +19,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 7f22853..8272e2d 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-imx/mx6/litesom.c b/arch/arm/mach-
> imx/mx6/litesom.c
> index 590e92f..777e7b3 100644
> --- a/arch/arm/mach-imx/mx6/litesom.c
> +++ b/arch/arm/mach-imx/mx6/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-imx/mx6/opos6ul.c b/arch/arm/mach-
> imx/mx6/opos6ul.c
> index f8d7e8e..2de1321 100644
> --- a/arch/arm/mach-imx/mx6/opos6ul.c
> +++ b/arch/arm/mach-imx/mx6/opos6ul.c
> @@ -154,7 +154,7 @@ int dram_init(void)
> #ifdef CONFIG_SPL_BUILD
> #include <asm/arch/mx6-ddr.h>
> #include <asm/arch/opos6ul.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <spl.h>
>
> #define USDHC_PAD_CTRL ( \
> diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c
> index 908a0ca..b6d3a17 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 69cb21d..3c84043 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 <pci.h>
> #include <asm/io.h>
> #include <asm/system.h>
> diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-
> mvebu/armada3700/cpu.c
> index 6499eec..b9214f7 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 38e7d33..ce7e913 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/am33xx/fdt.c b/arch/arm/mach-
> omap2/am33xx/fdt.c
> index 02e8243..fa99dc7 100644
> --- a/arch/arm/mach-omap2/am33xx/fdt.c
> +++ b/arch/arm/mach-omap2/am33xx/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-omap2/fdt-common.c b/arch/arm/mach-
> omap2/fdt-common.c
> index 9297e9d..3c368ba 100644
> --- a/arch/arm/mach-omap2/fdt-common.c
> +++ b/arch/arm/mach-omap2/fdt-common.c
> @@ -5,7 +5,7 @@
> */
>
> #include <common.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <fdt_support.h>
>
> #include <asm/omap_common.h>
> diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-
> omap2/omap5/fdt.c
> index 1e556da..3aae94d 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 00eff90..692466c 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-socfpga/misc_gen5.c b/arch/arm/mach-
> socfpga/misc_gen5.c
> index a7dcacc..177b35f 100644
> --- a/arch/arm/mach-socfpga/misc_gen5.c
> +++ b/arch/arm/mach-socfpga/misc_gen5.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_late_init.c b/arch/arm/mach-
> uniphier/board_late_init.c
> index 6849b3d..adcc929 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 <stdio.h>
> #include <linux/io.h>
> diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-
> uniphier/boards.c
> index 9bfc4c2..104ed90 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/powerpc/cpu/mpc83xx/cpu.c
> b/arch/powerpc/cpu/mpc83xx/cpu.c
> index cb82621..3bdebd8 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 3ac4eb1..5250571 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 c7ea94c..bf41c69 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 1159f06..e1fee11 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 7a4465f..6cfe2f6 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 b298d11..4514d2e 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 30fbf14..948ad8f 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 1e0ea28..1120fd7 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 f9b74de..9c46762 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 9cc1676..1f928bd 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/lib/bootm.c b/arch/powerpc/lib/bootm.c
> index 6ef644d..5f14bcd 100644
> --- a/arch/powerpc/lib/bootm.c
> +++ b/arch/powerpc/lib/bootm.c
> @@ -22,7 +22,7 @@
> #include <vxworks.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 4a20fde..2a1cad1 100644
> --- a/arch/sandbox/cpu/cpu.c
> +++ b/arch/sandbox/cpu/cpu.c
> @@ -6,7 +6,7 @@
> #include <common.h>
> #include <dm.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 eac5b78..8813258 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 3f786a2..00bda7a 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/armltd/vexpress/vexpress_tc2.c
> b/board/armltd/vexpress/vexpress_tc2.c
> index c7adf95..b143e04 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/congatec/cgtqmx6eval/cgtqmx6eval.c
> b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
> index f982839..1647b61 100644
> --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
> +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
> @@ -767,7 +767,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 b2fe7fd..ad23eb0 100644
> --- a/board/el/el6x/el6x.c
> +++ b/board/el/el6x/el6x.c
> @@ -481,7 +481,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/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
> index 36a5519..35a1538 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 d9ccac7..1216d63 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 c642e88..9b10576 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 ed0b453..7a93e7c 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 23901a4..9d2888d 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 571dfbb..90bd7bc 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 b5025ab..e6952b5 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 9f4f808..ccea8b1 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 5c3c593..f3e0fb2 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 3411bed..e8639e0 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/ls1088a/ls1088a.c
> b/board/freescale/ls1088a/ls1088a.c
> index 0769e90..56e454f 100644
> --- a/board/freescale/ls1088a/ls1088a.c
> +++ b/board/freescale/ls1088a/ls1088a.c
> @@ -13,7 +13,7 @@
> #include <fsl_sec.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-fsl-layerscape/soc.h>
> diff --git a/board/freescale/ls2080a/ls2080a.c
> b/board/freescale/ls2080a/ls2080a.c
> index c60a090..2fcbd69 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 28c9538..616442f 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 d781e3e..2509247 100644
> --- a/board/freescale/ls2080ardb/ls2080ardb.c
> +++ b/board/freescale/ls2080ardb/ls2080ardb.c
> @@ -13,7 +13,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 b4a0dd5..93c7200 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 8974378..6587c6f 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 22f1565..52e2ce3 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 b715d83..7726881 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 b49e03e..c960228 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 5f502e2..2dc26f2 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
>
> DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/freescale/mpc8349itx/mpc8349itx.c
> b/board/freescale/mpc8349itx/mpc8349itx.c
> index 895e9ff..2818c5d 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
>
> DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/freescale/mpc837xemds/mpc837xemds.c
> b/board/freescale/mpc837xemds/mpc837xemds.c
> index 2330492..7a47064 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 cede1da..51cb637 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/mpc8541cds/mpc8541cds.c
> b/board/freescale/mpc8541cds/mpc8541cds.c
> index 7b264dd..33ced17 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 66fb228..a283365 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 de76d36..7574b1d 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 de5f566..9c74bfd 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/mpc8568mds/mpc8568mds.c
> b/board/freescale/mpc8568mds/mpc8568mds.c
> index a5c5d9d..4ad4270 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 122490c..8e72864 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 93d54f5..f6a34b5 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 d97562c..0c30779 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 2604a51..2714cac 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/mx6sabreauto/mx6sabreauto.c
> b/board/freescale/mx6sabreauto/mx6sabreauto.c
> index 9c83e35..52b016b 100644
> --- a/board/freescale/mx6sabreauto/mx6sabreauto.c
> +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
> @@ -734,7 +734,7 @@ int board_ehci_power(int port, int on)
> #ifdef CONFIG_SPL_BUILD
> #include <asm/arch/mx6-ddr.h>
> #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/mx6sabresd/mx6sabresd.c
> b/board/freescale/mx6sabresd/mx6sabresd.c
> index 878e1e7..d75dd88 100644
> --- a/board/freescale/mx6sabresd/mx6sabresd.c
> +++ b/board/freescale/mx6sabresd/mx6sabresd.c
> @@ -725,7 +725,7 @@ int checkboard(void)
> #ifdef CONFIG_SPL_BUILD
> #include <asm/arch/mx6-ddr.h>
> #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 e98aa10..1bc7356 100644
> --- a/board/freescale/mx6slevk/mx6slevk.c
> +++ b/board/freescale/mx6slevk/mx6slevk.c
> @@ -254,7 +254,7 @@ int checkboard(void)
>
> #ifdef CONFIG_SPL_BUILD
> #include <spl.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
>
> #define USDHC1_CD_GPIO IMX_GPIO_NR(4, 7)
> #define USDHC2_CD_GPIO IMX_GPIO_NR(5, 0)
> diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> index 34371ad..6c13513 100644
> --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> @@ -347,7 +347,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 cf7a069..a7b0fa8 100644
> --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> @@ -696,7 +696,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 a5d85c2..f56f139 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 bf49326..4e3c824 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 a23a5d5..b2569c2 100644
> --- a/board/freescale/p1023rdb/p1023rdb.c
> +++ b/board/freescale/p1023rdb/p1023rdb.c
> @@ -19,7 +19,7 @@
> #include <fsl_ddr_sdram.h>
> #include <asm/fsl_portals.h>
> #include <fsl_qbman.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 31c8ed9..4b792cf 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 02c8999..87ae1b1 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 cf5023c..2353f3f 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 7369289..5ece779 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 ba7041a..f13d41c 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 c53e3b7..68ee74b 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 c53e3b7..68ee74b 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 84a89da..5a6731c 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 ba7041a..f13d41c 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 08d74b4..398c62b 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 6387a20..36cff0d 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/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
> index 7e48507..96f60be 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 fec6915..8821105 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 9fb814d..b5f445a 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 4433e8c..6781893 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/keymile/km83xx/km83xx.c
> b/board/keymile/km83xx/km83xx.c
> index 5e07faa..81835e8 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 b827e43..b2c3679 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/liebherr/display5/spl.c
> b/board/liebherr/display5/spl.c
> index 0a36e65..437963e 100644
> --- a/board/liebherr/display5/spl.c
> +++ b/board/liebherr/display5/spl.c
> @@ -7,7 +7,7 @@
>
> #include <common.h>
> #include <spl.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <asm/io.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/mx6-ddr.h>
> diff --git a/board/mpc8308_p1m/mpc8308_p1m.c
> b/board/mpc8308_p1m/mpc8308_p1m.c
> index 234a387..e96645f 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 1538158..277590f 100644
> --- a/board/phytec/pcm058/pcm058.c
> +++ b/board/phytec/pcm058/pcm058.c
> @@ -397,7 +397,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/phytec/pfla02/pfla02.c
> b/board/phytec/pfla02/pfla02.c
> index 136f1d5..18ff9ef 100644
> --- a/board/phytec/pfla02/pfla02.c
> +++ b/board/phytec/pfla02/pfla02.c
> @@ -400,7 +400,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>
>
> #define MX6_PHYFLEX_ERR006282 IMX_GPIO_NR(2, 11)
> static void phyflex_err006282_workaround(void)
> diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
> index a3395ed..ef87f9f 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
>
> DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
> index 25329e4..1a48a6c 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 08ced10..b58e123 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>
>
> DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
> index 004f370..a130b7d 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 8891961..e08e22f 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 <spl.h>
> diff --git a/board/toradex/apalis_imx6/apalis_imx6.c
> b/board/toradex/apalis_imx6/apalis_imx6.c
> index d68fdc8..1436547 100644
> --- a/board/toradex/apalis_imx6/apalis_imx6.c
> +++ b/board/toradex/apalis_imx6/apalis_imx6.c
> @@ -892,7 +892,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 2998a09..7c50bbb 100644
> --- a/board/toradex/colibri_imx6/colibri_imx6.c
> +++ b/board/toradex/colibri_imx6/colibri_imx6.c
> @@ -743,7 +743,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 b4e4727..6e12d27 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 <asm/setup.h>
> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
> index 14991fd..d13e75c 100644
> --- a/board/tqc/tqma6/tqma6.c
> +++ b/board/tqc/tqma6/tqma6.c
> @@ -20,7 +20,7 @@
> #include <asm/mach-imx/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 1188215..be4c132 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 2360cff..128748f 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 7fa1289..dba63d9 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 4780e8c..1853b19 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 3818ab9..bb5574c 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 cb39190..999d89c 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 6237571..45924cd 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 6a3df52..4b3a46c 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 41419fe..ae606f5 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 1f05150..c90bb89 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 c17fa2c..6546272 100644
> --- a/cmd/bootefi.c
> +++ b/cmd/bootefi.c
> @@ -13,8 +13,8 @@
> #include <efi_loader.h>
> #include <efi_selftest.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 b783b0d..65661fa 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/cmd/spl.c b/cmd/spl.c
> index 3b8992a..5939897 100644
> --- a/cmd/spl.c
> +++ b/cmd/spl.c
> @@ -8,7 +8,7 @@
> #include <common.h>
> #include <command.h>
> #include <cmd_spl.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/common/board_info.c b/common/board_info.c
> index aa45e24..16cf966 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/boot_fit.c b/common/boot_fit.c
> index add65c4..4b5cec5 100644
> --- a/common/boot_fit.c
> +++ b/common/boot_fit.c
> @@ -11,7 +11,7 @@
> #include <common.h>
> #include <errno.h>
> #include <image.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
>
> static int fdt_offset(const void *fit)
> {
> diff --git a/common/bootm_os.c b/common/bootm_os.c
> index 31b1878..5e6b177 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 b866e66..b1d4ee8 100644
> --- a/common/bootstage.c
> +++ b/common/bootstage.c
> @@ -11,7 +11,7 @@
> */
>
> #include <common.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <malloc.h>
> #include <linux/compiler.h>
>
> diff --git a/common/common_fit.c b/common/common_fit.c
> index 85b33d8..3fef740 100644
> --- a/common/common_fit.c
> +++ b/common/common_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>
>
> ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
> diff --git a/common/fdt_support.c b/common/fdt_support.c
> index b148536..66a313e 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 24e4c7c..25103ba 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 e9609cd..14be3ca 100644
> --- a/common/image.c
> +++ b/common/image.c
> @@ -22,7 +22,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>
> diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
> index d7e9fc9..81f3f42 100644
> --- a/common/lcd_simplefb.c
> +++ b/common/lcd_simplefb.c
> @@ -11,7 +11,7 @@
> #include <dm.h>
> #include <lcd.h>
> #include <fdt_support.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <video.h>
>
> DECLARE_GLOBAL_DATA_PTR;
> diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
> index 60b85f0..59a85a9 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 cc07fbc..b705d03 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>
>
> #ifndef CONFIG_SYS_BOOTM_LEN
> diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
> index cd39f9b..d075985 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_net.c b/common/spl/spl_net.c
> index 8883109..79c9b35 100644
> --- a/common/spl/spl_net.c
> +++ b/common/spl/spl_net.c
> @@ -11,7 +11,7 @@
> #include <errno.h>
> #include <spl.h>
> #include <net.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
> index fa8c768..d9db9f3 100644
> --- a/common/spl/spl_ram.c
> +++ b/common/spl/spl_ram.c
> @@ -14,7 +14,7 @@
> #include <binman_sym.h>
> #include <mapmem.h>
> #include <spl.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
>
> #ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
> # define CONFIG_SPL_LOAD_FIT_ADDRESS 0
> diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
> index ff8085b..4ab3dcd 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/of_access.c b/drivers/core/of_access.c
> index c31cba7..9389199 100644
> --- a/drivers/core/of_access.c
> +++ b/drivers/core/of_access.c
> @@ -21,7 +21,7 @@
> */
>
> #include <common.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <dm/of_access.h>
> #include <linux/ctype.h>
> #include <linux/err.h>
> diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
> index 4757066..7513ea2 100644
> --- a/drivers/core/of_addr.c
> +++ b/drivers/core/of_addr.c
> @@ -8,7 +8,7 @@
> */
>
> #include <common.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <dm/of_access.h>
> #include <dm/of_addr.h>
> #include <linux/err.h>
> diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
> index 0381909..ca2e92b 100644
> --- a/drivers/core/of_extra.c
> +++ b/drivers/core/of_extra.c
> @@ -6,7 +6,7 @@
> */
>
> #include <common.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <dm/of_access.h>
> #include <dm/of_extra.h>
> #include <dm/ofnode.h>
> diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
> index d0bdea0..4e45326 100644
> --- a/drivers/core/ofnode.c
> +++ b/drivers/core/ofnode.c
> @@ -9,7 +9,7 @@
> #include <dm.h>
> #include <fdtdec.h>
> #include <fdt_support.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <dm/of_access.h>
> #include <dm/of_addr.h>
> #include <dm/ofnode.h>
> diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
> index 0f1d308..8a0e00f 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 36336b6..3a426ab 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/core/util.c b/drivers/core/util.c
> index aaaed4e..24abe14 100644
> --- a/drivers/core/util.c
> +++ b/drivers/core/util.c
> @@ -6,7 +6,7 @@
>
> #include <common.h>
> #include <dm/util.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <vsprintf.h>
>
> #ifdef CONFIG_DM_WARN
> diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
> index 0940faf..470e662 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/firmware/psci.c b/drivers/firmware/psci.c
> index cef8adc..2875f2f 100644
> --- a/drivers/firmware/psci.c
> +++ b/drivers/firmware/psci.c
> @@ -10,7 +10,7 @@
> #include <common.h>
> #include <dm.h>
> #include <dm/lists.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <linux/arm-smccc.h>
> #include <linux/errno.h>
> #include <linux/printk.h>
> diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
> index 3b3dd02..159dff8 100644
> --- a/drivers/misc/fsl_portals.c
> +++ b/drivers/misc/fsl_portals.c
> @@ -6,7 +6,7 @@
> */
>
> #include <common.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <fdt_support.h>
>
> #include <asm/processor.h>
> diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
> index e40575e..48643de 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 0f31dfc..be6edb2 100644
> --- a/drivers/mmc/rockchip_sdhci.c
> +++ b/drivers/mmc/rockchip_sdhci.c
> @@ -9,7 +9,7 @@
> #include <common.h>
> #include <dm.h>
> #include <dt-structs.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <malloc.h>
> #include <mapmem.h>
> #include <sdhci.h>
> diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
> index 62817a0..96bac9d 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/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
> index 0b174fc..a07e43c 100644
> --- a/drivers/mmc/sdhci-cadence.c
> +++ b/drivers/mmc/sdhci-cadence.c
> @@ -11,7 +11,7 @@
> #include <linux/io.h>
> #include <linux/iopoll.h>
> #include <linux/sizes.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <mmc.h>
> #include <sdhci.h>
>
> diff --git a/drivers/mmc/socfpga_dw_mmc.c
> b/drivers/mmc/socfpga_dw_mmc.c
> index 759686c..9ace505 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/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
> index f3b77f5..bd2200a 100644
> --- a/drivers/mmc/stm32_sdmmc2.c
> +++ b/drivers/mmc/stm32_sdmmc2.c
> @@ -9,7 +9,7 @@
> #include <clk.h>
> #include <dm.h>
> #include <fdtdec.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <mmc.h>
> #include <reset.h>
> #include <asm/io.h>
> diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
> index 490a01f..9427a24 100644
> --- a/drivers/mmc/xenon_sdhci.c
> +++ b/drivers/mmc/xenon_sdhci.c
> @@ -18,7 +18,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/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
> index 414778c..9463a06 100644
> --- a/drivers/mmc/zynq_sdhci.c
> +++ b/drivers/mmc/zynq_sdhci.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 <sdhci.h>
>
> diff --git a/drivers/mtd/spi/sunxi_spi_spl.c
> b/drivers/mtd/spi/sunxi_spi_spl.c
> index 35835c2..fa22981 100644
> --- a/drivers/mtd/spi/sunxi_spi_spl.c
> +++ b/drivers/mtd/spi/sunxi_spi_spl.c
> @@ -8,7 +8,7 @@
> #include <spl.h>
> #include <asm/gpio.h>
> #include <asm/io.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
>
> #ifdef CONFIG_SPL_OS_BOOT
> #error CONFIG_SPL_OS_BOOT is not supported yet
> diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
> index 760a124..ea9ae5b 100644
> --- a/drivers/net/fsl-mc/mc.c
> +++ b/drivers/net/fsl-mc/mc.c
> @@ -8,7 +8,7 @@
> #include <errno.h>
> #include <linux/bug.h>
> #include <asm/io.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <net.h>
> #include <fdt_support.h>
> #include <fsl-mc/fsl_mc.h>
> diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
> index df76a94..11104dc 100644
> --- a/drivers/pci/fsl_pci_init.c
> +++ b/drivers/pci/fsl_pci_init.c
> @@ -886,7 +886,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 0f8e3c9..dcea192 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_fixup.c
> b/drivers/pci/pcie_layerscape_fixup.c
> index 3dae201..e2ea7c8 100644
> --- a/drivers/pci/pcie_layerscape_fixup.c
> +++ b/drivers/pci/pcie_layerscape_fixup.c
> @@ -12,7 +12,7 @@
> #include <asm/io.h>
> #include <errno.h>
> #ifdef CONFIG_OF_BOARD_SETUP
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <fdt_support.h>
> #ifdef CONFIG_ARM
> #include <asm/arch/clock.h>
> diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
> index c671ac6..727fb8b 100644
> --- a/drivers/phy/sti_usb_phy.c
> +++ b/drivers/phy/sti_usb_phy.c
> @@ -12,7 +12,7 @@
> #include <errno.h>
> #include <fdtdec.h>
> #include <generic-phy.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <regmap.h>
> #include <reset-uclass.h>
> #include <syscon.h>
> diff --git a/drivers/pinctrl/pinctrl-single.c
> b/drivers/pinctrl/pinctrl-single.c
> index a38d774..72f99be 100644
> --- a/drivers/pinctrl/pinctrl-single.c
> +++ b/drivers/pinctrl/pinctrl-single.c
> @@ -7,7 +7,7 @@
> #include <common.h>
> #include <dm.h>
> #include <dm/pinctrl.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <asm/io.h>
>
> DECLARE_GLOBAL_DATA_PTR;
> diff --git a/drivers/pinctrl/pinctrl-uclass.c
> b/drivers/pinctrl/pinctrl-uclass.c
> index 114952a..6a73a06 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.h>
> diff --git a/drivers/power/pmic/act8846.c
> b/drivers/power/pmic/act8846.c
> index a6b0940..7d107f4 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/rn5t567.c
> b/drivers/power/pmic/rn5t567.c
> index 001e695..9e5b0b1 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 b63f941..169f095 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 4f48f98..9bbdc60 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 749bbbd..be69fb0 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 e8432bb..69cf11c 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/dwc3-sti-glue.c b/drivers/usb/host/dwc3-
> sti-glue.c
> index 67b2561..ce9335e 100644
> --- a/drivers/usb/host/dwc3-sti-glue.c
> +++ b/drivers/usb/host/dwc3-sti-glue.c
> @@ -12,7 +12,7 @@
> #include <dm.h>
> #include <errno.h>
> #include <fdtdec.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <dm/lists.h>
> #include <regmap.h>
> #include <reset-uclass.h>
> diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-
> exynos.c
> index 30297b0..a2c6d5a 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 f5320ca..ea008bb 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 1c72330..f317cf0 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 "ehci.h"
>
> diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
> index 5bb3763..3d63cfa 100644
> --- a/drivers/usb/host/ehci-vf.c
> +++ b/drivers/usb/host/ehci-vf.c
> @@ -20,7 +20,7 @@
> #include <asm/mach-imx/iomux-v3.h>
> #include <asm/mach-imx/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 bf72865..6f08d5d 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/phy/rockchip_usb2_phy.c
> b/drivers/usb/phy/rockchip_usb2_phy.c
> index 1958478..01bda15 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 2be230c..30e4020 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 aae78a8..f84dd70 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 6ca17f2..a2879a9 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 a5d9b59..724d08f 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 46bf83f..76ef5b7 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 4153a6a..2941a2e 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 325b014..dbdaecb 100644
> --- a/include/image.h
> +++ b/include/image.h
> @@ -53,7 +53,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/libfdt.h
> deleted file mode 100644
> index b00e993..0000000
> --- a/include/libfdt.h
> +++ /dev/null
> @@ -1,318 +0,0 @@
> -#ifndef UBOOT_LIBFDT_H
> -#define UBOOT_LIBFDT_H
> -/*
> - * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
> - */
> -
> -#ifdef USE_HOSTCC
> -#include "../scripts/dtc/libfdt/libfdt.h"
> -#else
> -#include <linux/libfdt.h>
> -#endif
> -
> -/* U-Boot local hacks */
> -
> -#ifndef SWIG /* Not available in Python */
> -struct fdt_region {
> - int offset;
> - int size;
> -};
> -
> -/*
> - * Flags for fdt_find_regions()
> - *
> - * Add a region for the string table (always the last region)
> - */
> -#define FDT_REG_ADD_STRING_TAB (1 << 0)
> -
> -/*
> - * Add all supernodes of a matching node/property, useful for
> creating a
> - * valid subset tree
> - */
> -#define FDT_REG_SUPERNODES (1 << 1)
> -
> -/* Add the FDT_BEGIN_NODE tags of subnodes, including their names */
> -#define FDT_REG_DIRECT_SUBNODES (1 << 2)
> -
> -/* Add all subnodes of a matching node */
> -#define FDT_REG_ALL_SUBNODES (1 << 3)
> -
> -/* Add a region for the mem_rsvmap table (always the first region) */
> -#define FDT_REG_ADD_MEM_RSVMAP (1 << 4)
> -
> -/* Indicates what an fdt part is (node, property, value) */
> -#define FDT_IS_NODE (1 << 0)
> -#define FDT_IS_PROP (1 << 1)
> -#define FDT_IS_VALUE (1 << 2) /* not
> supported */
> -#define FDT_IS_COMPAT (1 << 3) /* used
> internally */
> -#define FDT_NODE_HAS_PROP (1 << 4) /* node
> contains prop */
> -
> -#define FDT_ANY_GLOBAL (FDT_IS_NODE | FDT_IS_PROP |
> FDT_IS_VALUE | \
> - FDT_IS_COMPAT)
> -#define FDT_IS_ANY 0x1f /* all
> the above */
> -
> -/* We set a reasonable limit on the number of nested nodes */
> -#define FDT_MAX_DEPTH 32
> -
> -/* Decribes what we want to include from the current tag */
> -enum want_t {
> - WANT_NOTHING,
> - WANT_NODES_ONLY, /* No properties */
> - WANT_NODES_AND_PROPS, /* Everything for one
> level */
> - WANT_ALL_NODES_AND_PROPS /* Everything for all levels
> */
> -};
> -
> -/* Keeps track of the state at parent nodes */
> -struct fdt_subnode_stack {
> - int offset; /* Offset of node */
> - enum want_t want; /* The 'want' value here */
> - int included; /* 1 if we included this node, 0
> if not */
> -};
> -
> -struct fdt_region_ptrs {
> - int depth; /* Current tree depth */
> - int done; /* What we have completed
> scanning */
> - enum want_t want; /* What we are currently
> including */
> - char *end; /* Pointer to end of full
> node path */
> - int nextoffset; /* Next node offset to
> check */
> -};
> -
> -/* The state of our finding algortihm */
> -struct fdt_region_state {
> - struct fdt_subnode_stack stack[FDT_MAX_DEPTH]; /* node
> stack */
> - struct fdt_region *region; /* Contains list of regions
> found */
> - int count; /* Numnber of regions found
> */
> - const void *fdt; /* FDT blob */
> - int max_regions; /* Maximum regions to find */
> - int can_merge; /* 1 if we can merge with
> previous region */
> - int start; /* Start position of
> current region */
> - struct fdt_region_ptrs ptrs; /* Pointers for what we
> are up to */
> -};
> -
> -/**
> - * fdt_find_regions() - find regions in device tree
> - *
> - * Given a list of nodes to include and properties to exclude, find
> - * the regions of the device tree which describe those included
> parts.
> - *
> - * The intent is to get a list of regions which will be invariant
> provided
> - * those parts are invariant. For example, if you request a list of
> regions
> - * for all nodes but exclude the property "data", then you will get
> the
> - * same region contents regardless of any change to "data"
> properties.
> - *
> - * This function can be used to produce a byte-stream to send to a
> hashing
> - * function to verify that critical parts of the FDT have not
> changed.
> - *
> - * Nodes which are given in 'inc' are included in the region list, as
> - * are the names of the immediate subnodes nodes (but not the
> properties
> - * or subnodes of those subnodes).
> - *
> - * For eaxample "/" means to include the root node, all root
> properties
> - * and the FDT_BEGIN_NODE and FDT_END_NODE of all subnodes of /. The
> latter
> - * ensures that we capture the names of the subnodes. In a hashing
> situation
> - * it prevents the root node from changing at all Any change to non-
> excluded
> - * properties, names of subnodes or number of subnodes would be
> detected.
> - *
> - * When used with FITs this provides the ability to hash and sign
> parts of
> - * the FIT based on different configurations in the FIT. Then it is
> - * impossible to change anything about that configuration (include
> images
> - * attached to the configuration), but it may be possible to add new
> - * configurations, new images or new signatures within the existing
> - * framework.
> - *
> - * Adding new properties to a device tree may result in the string
> table
> - * being extended (if the new property names are different from those
> - * already added). This function can optionally include a region for
> - * the string table so that this can be part of the hash too.
> - *
> - * The device tree header is not included in the list.
> - *
> - * @fdt: Device tree to check
> - * @inc: List of node paths to included
> - * @inc_count: Number of node paths in list
> - * @exc_prop: List of properties names to exclude
> - * @exc_prop_count: Number of properties in exclude list
> - * @region: Returns list of regions
> - * @max_region: Maximum length of region list
> - * @path: Pointer to a temporary string for the function to
> use for
> - * building path names
> - * @path_len: Length of path, must be large enough to hold the
> longest
> - * path in the tree
> - * @add_string_tab: 1 to add a region for the string table
> - * @return number of regions in list. If this is >max_regions then
> the
> - * region array was exhausted. You should increase max_regions and
> try
> - * the call again.
> - */
> -int fdt_find_regions(const void *fdt, char * const inc[], int
> inc_count,
> - char * const exc_prop[], int exc_prop_count,
> - struct fdt_region region[], int max_regions,
> - char *path, int path_len, int add_string_tab);
> -
> -/**
> - * fdt_first_region() - find regions in device tree
> - *
> - * Given a nodes and properties to include and properties to exclude,
> find
> - * the regions of the device tree which describe those included
> parts.
> - *
> - * The use for this function is twofold. Firstly it provides a
> convenient
> - * way of performing a structure-aware grep of the tree. For example
> it is
> - * possible to grep for a node and get all the properties associated
> with
> - * that node. Trees can be subsetted easily, by specifying the nodes
> that
> - * are required, and then writing out the regions returned by this
> function.
> - * This is useful for small resource-constrained systems, such as
> boot
> - * loaders, which want to use an FDT but do not need to know about
> all of
> - * it.
> - *
> - * Secondly it makes it easy to hash parts of the tree and detect
> changes.
> - * The intent is to get a list of regions which will be invariant
> provided
> - * those parts are invariant. For example, if you request a list of
> regions
> - * for all nodes but exclude the property "data", then you will get
> the
> - * same region contents regardless of any change to "data"
> properties.
> - *
> - * This function can be used to produce a byte-stream to send to a
> hashing
> - * function to verify that critical parts of the FDT have not
> changed.
> - * Note that semantically null changes in order could still cause
> false
> - * hash misses. Such reordering might happen if the tree is
> regenerated
> - * from source, and nodes are reordered (the bytes-stream will be
> emitted
> - * in a different order and many hash functions will detect this).
> However
> - * if an existing tree is modified using libfdt functions, such as
> - * fdt_add_subnode() and fdt_setprop(), then this problem is avoided.
> - *
> - * The nodes/properties to include/exclude are defined by a function
> - * provided by the caller. This function is called for each node and
> - * property, and must return:
> - *
> - * 0 - to exclude this part
> - * 1 - to include this part
> - * -1 - for FDT_IS_PROP only: no information is available, so
> include
> - * if its containing node is included
> - *
> - * The last case is only used to deal with properties. Often a
> property is
> - * included if its containing node is included - this is the case
> where
> - * -1 is returned.. However if the property is specifically required
> to be
> - * included/excluded, then 0 or 1 can be returned. Note that
> including a
> - * property when the FDT_REG_SUPERNODES flag is given will force its
> - * containing node to be included since it is not valid to have a
> property
> - * that is not in a node.
> - *
> - * Using the information provided, the inclusion of a node can be
> controlled
> - * either by a node name or its compatible string, or any other
> property
> - * that the function can determine.
> - *
> - * As an example, including node "/" means to include the root node
> and all
> - * root properties. A flag provides a way of also including
> supernodes (of
> - * which there is none for the root node), and another flag includes
> - * immediate subnodes, so in this case we would get the
> FDT_BEGIN_NODE and
> - * FDT_END_NODE of all subnodes of /.
> - *
> - * The subnode feature helps in a hashing situation since it prevents
> the
> - * root node from changing at all. Any change to non-excluded
> properties,
> - * names of subnodes or number of subnodes would be detected.
> - *
> - * When used with FITs this provides the ability to hash and sign
> parts of
> - * the FIT based on different configurations in the FIT. Then it is
> - * impossible to change anything about that configuration (include
> images
> - * attached to the configuration), but it may be possible to add new
> - * configurations, new images or new signatures within the existing
> - * framework.
> - *
> - * Adding new properties to a device tree may result in the string
> table
> - * being extended (if the new property names are different from those
> - * already added). This function can optionally include a region for
> - * the string table so that this can be part of the hash too. This is
> always
> - * the last region.
> - *
> - * The FDT also has a mem_rsvmap table which can also be included,
> and is
> - * always the first region if so.
> - *
> - * The device tree header is not included in the region list. Since
> the
> - * contents of the FDT are changing (shrinking, often), the caller
> will need
> - * to regenerate the header anyway.
> - *
> - * @fdt: Device tree to check
> - * @h_include: Function to call to determine whether to
> include a part or
> - * not:
> - *
> - * @priv: Private pointer as passed to
> fdt_find_regions()
> - * @fdt: Pointer to FDT blob
> - * @offset: Offset of this node / property
> - * @type: Type of this part, FDT_IS_...
> - * @data: Pointer to data (node name, property name,
> compatible
> - * string, value (not yet supported)
> - * @size: Size of data, or 0 if none
> - * @return 0 to exclude, 1 to include, -1 if no
> information is
> - * available
> - * @priv: Private pointer passed to h_include
> - * @region: Returns list of regions, sorted by offset
> - * @max_regions: Maximum length of region list
> - * @path: Pointer to a temporary string for the function to
> use for
> - * building path names
> - * @path_len: Length of path, must be large enough to hold the
> longest
> - * path in the tree
> - * @flags: Various flags that control the region algortihm,
> see
> - * FDT_REG_...
> - * @return number of regions in list. If this is >max_regions then
> the
> - * region array was exhausted. You should increase max_regions and
> try
> - * the call again. Only the first max_regions elements are available
> in the
> - * array.
> - *
> - * On error a -ve value is return, which can be:
> - *
> - * -FDT_ERR_BADSTRUCTURE (too deep or more END tags than BEGIN
> tags
> - * -FDT_ERR_BADLAYOUT
> - * -FDT_ERR_NOSPACE (path area is too small)
> - */
> -int fdt_first_region(const void *fdt,
> - int (*h_include)(void *priv, const void *fdt,
> int offset,
> - int type, const char *data, int
> size),
> - void *priv, struct fdt_region *region,
> - char *path, int path_len, int flags,
> - struct fdt_region_state *info);
> -
> -/** fdt_next_region() - find next region
> - *
> - * See fdt_first_region() for full description. This function finds
> the
> - * next region according to the provided parameters, which must be
> the same
> - * as passed to fdt_first_region().
> - *
> - * This function can additionally return -FDT_ERR_NOTFOUND when there
> are no
> - * more regions
> - */
> -int fdt_next_region(const void *fdt,
> - int (*h_include)(void *priv, const void *fdt, int
> offset,
> - int type, const char *data, int
> size),
> - void *priv, struct fdt_region *region,
> - char *path, int path_len, int flags,
> - struct fdt_region_state *info);
> -
> -/**
> - * fdt_add_alias_regions() - find aliases that point to existing
> regions
> - *
> - * Once a device tree grep is complete some of the nodes will be
> present
> - * and some will have been dropped. This function checks all the
> alias nodes
> - * to figure out which points point to nodes which are still present.
> These
> - * aliases need to be kept, along with the nodes they reference.
> - *
> - * Given a list of regions function finds the aliases that still
> apply and
> - * adds more regions to the list for these. This function is called
> after
> - * fdt_next_region() has finished returning regions and requires the
> same
> - * state.
> - *
> - * @fdt: Device tree file to reference
> - * @region: List of regions that will be kept
> - * @count: Number of regions
> - * @max_regions: Number of entries that can fit in @region
> - * @info: Region state as returned from fdt_next_region()
> - * @return new number of regions in @region (i.e. count + the number
> added)
> - * or -FDT_ERR_NOSPACE if there was not enough space.
> - */
> -int fdt_add_alias_regions(const void *fdt, struct fdt_region *region,
> int count,
> - int max_regions, struct fdt_region_state
> *info);
> -#endif /* SWIG */
> -
> -extern struct fdt_header *working_fdt; /* Pointer to the working fdt
> */
> -
> -/* adding a ramdisk needs 0x44 bytes in version 2008.10 */
> -#define FDT_RAMDISK_OVERHEAD 0x80
> -
> -#endif /* UBOOT_LIBFDT_H */
> diff --git a/include/libfdt_env.h b/include/libfdt_env.h
> deleted file mode 100644
> index d7e9d32..0000000
> --- a/include/libfdt_env.h
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -#ifdef USE_HOSTCC
> -#include "../scripts/dtc/libfdt/libfdt_env.h"
> -#else
> -#include <linux/libfdt_env.h>
> -#endif
> diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h
> index 90ed4eb..9e6eead 100644
> --- a/include/linux/libfdt.h
> +++ b/include/linux/libfdt.h
> @@ -2,7 +2,314 @@
> #ifndef _INCLUDE_LIBFDT_H_
> #define _INCLUDE_LIBFDT_H_
>
> +#ifndef USE_HOSTCC
> #include <linux/libfdt_env.h>
> +#endif
> #include "../../scripts/dtc/libfdt/libfdt.h"
>
> +/* U-Boot local hacks */
> +
> +#ifndef SWIG /* Not available in Python */
> +struct fdt_region {
> + int offset;
> + int size;
> +};
> +
> +/*
> + * Flags for fdt_find_regions()
> + *
> + * Add a region for the string table (always the last region)
> + */
> +#define FDT_REG_ADD_STRING_TAB (1 << 0)
> +
> +/*
> + * Add all supernodes of a matching node/property, useful for
> creating a
> + * valid subset tree
> + */
> +#define FDT_REG_SUPERNODES (1 << 1)
> +
> +/* Add the FDT_BEGIN_NODE tags of subnodes, including their names */
> +#define FDT_REG_DIRECT_SUBNODES (1 << 2)
> +
> +/* Add all subnodes of a matching node */
> +#define FDT_REG_ALL_SUBNODES (1 << 3)
> +
> +/* Add a region for the mem_rsvmap table (always the first region) */
> +#define FDT_REG_ADD_MEM_RSVMAP (1 << 4)
> +
> +/* Indicates what an fdt part is (node, property, value) */
> +#define FDT_IS_NODE (1 << 0)
> +#define FDT_IS_PROP (1 << 1)
> +#define FDT_IS_VALUE (1 << 2) /* not
> supported */
> +#define FDT_IS_COMPAT (1 << 3) /* used
> internally */
> +#define FDT_NODE_HAS_PROP (1 << 4) /* node
> contains prop */
> +
> +#define FDT_ANY_GLOBAL (FDT_IS_NODE | FDT_IS_PROP |
> FDT_IS_VALUE | \
> + FDT_IS_COMPAT)
> +#define FDT_IS_ANY 0x1f /* all
> the above */
> +
> +/* We set a reasonable limit on the number of nested nodes */
> +#define FDT_MAX_DEPTH 32
> +
> +/* Decribes what we want to include from the current tag */
> +enum want_t {
> + WANT_NOTHING,
> + WANT_NODES_ONLY, /* No properties */
> + WANT_NODES_AND_PROPS, /* Everything for one
> level */
> + WANT_ALL_NODES_AND_PROPS /* Everything for all levels
> */
> +};
> +
> +/* Keeps track of the state at parent nodes */
> +struct fdt_subnode_stack {
> + int offset; /* Offset of node */
> + enum want_t want; /* The 'want' value here */
> + int included; /* 1 if we included this node, 0
> if not */
> +};
> +
> +struct fdt_region_ptrs {
> + int depth; /* Current tree depth */
> + int done; /* What we have completed
> scanning */
> + enum want_t want; /* What we are currently
> including */
> + char *end; /* Pointer to end of full
> node path */
> + int nextoffset; /* Next node offset to
> check */
> +};
> +
> +/* The state of our finding algortihm */
> +struct fdt_region_state {
> + struct fdt_subnode_stack stack[FDT_MAX_DEPTH]; /* node
> stack */
> + struct fdt_region *region; /* Contains list of regions
> found */
> + int count; /* Numnber of regions found
> */
> + const void *fdt; /* FDT blob */
> + int max_regions; /* Maximum regions to find */
> + int can_merge; /* 1 if we can merge with
> previous region */
> + int start; /* Start position of
> current region */
> + struct fdt_region_ptrs ptrs; /* Pointers for what we
> are up to */
> +};
> +
> +/**
> + * fdt_find_regions() - find regions in device tree
> + *
> + * Given a list of nodes to include and properties to exclude, find
> + * the regions of the device tree which describe those included
> parts.
> + *
> + * The intent is to get a list of regions which will be invariant
> provided
> + * those parts are invariant. For example, if you request a list of
> regions
> + * for all nodes but exclude the property "data", then you will get
> the
> + * same region contents regardless of any change to "data"
> properties.
> + *
> + * This function can be used to produce a byte-stream to send to a
> hashing
> + * function to verify that critical parts of the FDT have not
> changed.
> + *
> + * Nodes which are given in 'inc' are included in the region list, as
> + * are the names of the immediate subnodes nodes (but not the
> properties
> + * or subnodes of those subnodes).
> + *
> + * For eaxample "/" means to include the root node, all root
> properties
> + * and the FDT_BEGIN_NODE and FDT_END_NODE of all subnodes of /. The
> latter
> + * ensures that we capture the names of the subnodes. In a hashing
> situation
> + * it prevents the root node from changing at all Any change to non-
> excluded
> + * properties, names of subnodes or number of subnodes would be
> detected.
> + *
> + * When used with FITs this provides the ability to hash and sign
> parts of
> + * the FIT based on different configurations in the FIT. Then it is
> + * impossible to change anything about that configuration (include
> images
> + * attached to the configuration), but it may be possible to add new
> + * configurations, new images or new signatures within the existing
> + * framework.
> + *
> + * Adding new properties to a device tree may result in the string
> table
> + * being extended (if the new property names are different from those
> + * already added). This function can optionally include a region for
> + * the string table so that this can be part of the hash too.
> + *
> + * The device tree header is not included in the list.
> + *
> + * @fdt: Device tree to check
> + * @inc: List of node paths to included
> + * @inc_count: Number of node paths in list
> + * @exc_prop: List of properties names to exclude
> + * @exc_prop_count: Number of properties in exclude list
> + * @region: Returns list of regions
> + * @max_region: Maximum length of region list
> + * @path: Pointer to a temporary string for the function to
> use for
> + * building path names
> + * @path_len: Length of path, must be large enough to hold the
> longest
> + * path in the tree
> + * @add_string_tab: 1 to add a region for the string table
> + * @return number of regions in list. If this is >max_regions then
> the
> + * region array was exhausted. You should increase max_regions and
> try
> + * the call again.
> + */
> +int fdt_find_regions(const void *fdt, char * const inc[], int
> inc_count,
> + char * const exc_prop[], int exc_prop_count,
> + struct fdt_region region[], int max_regions,
> + char *path, int path_len, int add_string_tab);
> +
> +/**
> + * fdt_first_region() - find regions in device tree
> + *
> + * Given a nodes and properties to include and properties to exclude,
> find
> + * the regions of the device tree which describe those included
> parts.
> + *
> + * The use for this function is twofold. Firstly it provides a
> convenient
> + * way of performing a structure-aware grep of the tree. For example
> it is
> + * possible to grep for a node and get all the properties associated
> with
> + * that node. Trees can be subsetted easily, by specifying the nodes
> that
> + * are required, and then writing out the regions returned by this
> function.
> + * This is useful for small resource-constrained systems, such as
> boot
> + * loaders, which want to use an FDT but do not need to know about
> all of
> + * it.
> + *
> + * Secondly it makes it easy to hash parts of the tree and detect
> changes.
> + * The intent is to get a list of regions which will be invariant
> provided
> + * those parts are invariant. For example, if you request a list of
> regions
> + * for all nodes but exclude the property "data", then you will get
> the
> + * same region contents regardless of any change to "data"
> properties.
> + *
> + * This function can be used to produce a byte-stream to send to a
> hashing
> + * function to verify that critical parts of the FDT have not
> changed.
> + * Note that semantically null changes in order could still cause
> false
> + * hash misses. Such reordering might happen if the tree is
> regenerated
> + * from source, and nodes are reordered (the bytes-stream will be
> emitted
> + * in a different order and many hash functions will detect this).
> However
> + * if an existing tree is modified using libfdt functions, such as
> + * fdt_add_subnode() and fdt_setprop(), then this problem is avoided.
> + *
> + * The nodes/properties to include/exclude are defined by a function
> + * provided by the caller. This function is called for each node and
> + * property, and must return:
> + *
> + * 0 - to exclude this part
> + * 1 - to include this part
> + * -1 - for FDT_IS_PROP only: no information is available, so
> include
> + * if its containing node is included
> + *
> + * The last case is only used to deal with properties. Often a
> property is
> + * included if its containing node is included - this is the case
> where
> + * -1 is returned.. However if the property is specifically required
> to be
> + * included/excluded, then 0 or 1 can be returned. Note that
> including a
> + * property when the FDT_REG_SUPERNODES flag is given will force its
> + * containing node to be included since it is not valid to have a
> property
> + * that is not in a node.
> + *
> + * Using the information provided, the inclusion of a node can be
> controlled
> + * either by a node name or its compatible string, or any other
> property
> + * that the function can determine.
> + *
> + * As an example, including node "/" means to include the root node
> and all
> + * root properties. A flag provides a way of also including
> supernodes (of
> + * which there is none for the root node), and another flag includes
> + * immediate subnodes, so in this case we would get the
> FDT_BEGIN_NODE and
> + * FDT_END_NODE of all subnodes of /.
> + *
> + * The subnode feature helps in a hashing situation since it prevents
> the
> + * root node from changing at all. Any change to non-excluded
> properties,
> + * names of subnodes or number of subnodes would be detected.
> + *
> + * When used with FITs this provides the ability to hash and sign
> parts of
> + * the FIT based on different configurations in the FIT. Then it is
> + * impossible to change anything about that configuration (include
> images
> + * attached to the configuration), but it may be possible to add new
> + * configurations, new images or new signatures within the existing
> + * framework.
> + *
> + * Adding new properties to a device tree may result in the string
> table
> + * being extended (if the new property names are different from those
> + * already added). This function can optionally include a region for
> + * the string table so that this can be part of the hash too. This is
> always
> + * the last region.
> + *
> + * The FDT also has a mem_rsvmap table which can also be included,
> and is
> + * always the first region if so.
> + *
> + * The device tree header is not included in the region list. Since
> the
> + * contents of the FDT are changing (shrinking, often), the caller
> will need
> + * to regenerate the header anyway.
> + *
> + * @fdt: Device tree to check
> + * @h_include: Function to call to determine whether to
> include a part or
> + * not:
> + *
> + * @priv: Private pointer as passed to
> fdt_find_regions()
> + * @fdt: Pointer to FDT blob
> + * @offset: Offset of this node / property
> + * @type: Type of this part, FDT_IS_...
> + * @data: Pointer to data (node name, property name,
> compatible
> + * string, value (not yet supported)
> + * @size: Size of data, or 0 if none
> + * @return 0 to exclude, 1 to include, -1 if no
> information is
> + * available
> + * @priv: Private pointer passed to h_include
> + * @region: Returns list of regions, sorted by offset
> + * @max_regions: Maximum length of region list
> + * @path: Pointer to a temporary string for the function to
> use for
> + * building path names
> + * @path_len: Length of path, must be large enough to hold the
> longest
> + * path in the tree
> + * @flags: Various flags that control the region algortihm,
> see
> + * FDT_REG_...
> + * @return number of regions in list. If this is >max_regions then
> the
> + * region array was exhausted. You should increase max_regions and
> try
> + * the call again. Only the first max_regions elements are available
> in the
> + * array.
> + *
> + * On error a -ve value is return, which can be:
> + *
> + * -FDT_ERR_BADSTRUCTURE (too deep or more END tags than BEGIN
> tags
> + * -FDT_ERR_BADLAYOUT
> + * -FDT_ERR_NOSPACE (path area is too small)
> + */
> +int fdt_first_region(const void *fdt,
> + int (*h_include)(void *priv, const void *fdt,
> int offset,
> + int type, const char *data, int
> size),
> + void *priv, struct fdt_region *region,
> + char *path, int path_len, int flags,
> + struct fdt_region_state *info);
> +
> +/** fdt_next_region() - find next region
> + *
> + * See fdt_first_region() for full description. This function finds
> the
> + * next region according to the provided parameters, which must be
> the same
> + * as passed to fdt_first_region().
> + *
> + * This function can additionally return -FDT_ERR_NOTFOUND when there
> are no
> + * more regions
> + */
> +int fdt_next_region(const void *fdt,
> + int (*h_include)(void *priv, const void *fdt, int
> offset,
> + int type, const char *data, int
> size),
> + void *priv, struct fdt_region *region,
> + char *path, int path_len, int flags,
> + struct fdt_region_state *info);
> +
> +/**
> + * fdt_add_alias_regions() - find aliases that point to existing
> regions
> + *
> + * Once a device tree grep is complete some of the nodes will be
> present
> + * and some will have been dropped. This function checks all the
> alias nodes
> + * to figure out which points point to nodes which are still present.
> These
> + * aliases need to be kept, along with the nodes they reference.
> + *
> + * Given a list of regions function finds the aliases that still
> apply and
> + * adds more regions to the list for these. This function is called
> after
> + * fdt_next_region() has finished returning regions and requires the
> same
> + * state.
> + *
> + * @fdt: Device tree file to reference
> + * @region: List of regions that will be kept
> + * @count: Number of regions
> + * @max_regions: Number of entries that can fit in @region
> + * @info: Region state as returned from fdt_next_region()
> + * @return new number of regions in @region (i.e. count + the number
> added)
> + * or -FDT_ERR_NOSPACE if there was not enough space.
> + */
> +int fdt_add_alias_regions(const void *fdt, struct fdt_region *region,
> int count,
> + int max_regions, struct fdt_region_state
> *info);
> +#endif /* SWIG */
> +
> +extern struct fdt_header *working_fdt; /* Pointer to the working fdt
> */
> +
> +/* adding a ramdisk needs 0x44 bytes in version 2008.10 */
> +#define FDT_RAMDISK_OVERHEAD 0x80
> +
> #endif /* _INCLUDE_LIBFDT_H_ */
> diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h
> index 8178f91..0d209a6 100644
> --- a/include/linux/libfdt_env.h
> +++ b/include/linux/libfdt_env.h
> @@ -1,3 +1,11 @@
> +#ifdef USE_HOSTCC
> +#include "../scripts/dtc/libfdt/libfdt_env.h"
> +#else
> +/*
> + * This position of the include guard is intentional.
> + * Using the same guard name as that of
> scripts/dtc/libfdt/libfdt_env.h
> + * prevents it from being included.
> + */
> #ifndef _LIBFDT_ENV_H
> #define _LIBFDT_ENV_H
>
> @@ -20,3 +28,4 @@ typedef __be64 fdt64_t;
> #define strtoul(cp, endp, base) simple_strtoul(cp, endp, base)
>
> #endif /* _LIBFDT_ENV_H */
> +#endif
> diff --git a/lib/efi_loader/efi_boottime.c
> b/lib/efi_loader/efi_boottime.c
> index 6eea239..66e26fd 100644
> --- a/lib/efi_loader/efi_boottime.c
> +++ b/lib/efi_loader/efi_boottime.c
> @@ -12,7 +12,7 @@
> #include <environment.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 aaf6442..ff0edf3 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 df9d9ae..320ee1d 100644
> --- a/lib/fdtdec.c
> +++ b/lib/fdtdec.c
> @@ -11,7 +11,7 @@
> #include <errno.h>
> #include <fdtdec.h>
> #include <fdt_support.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <serial.h>
> #include <asm/sections.h>
> #include <linux/ctype.h>
> diff --git a/lib/fdtdec_common.c b/lib/fdtdec_common.c
> index 63b704a..2d08341 100644
> --- a/lib/fdtdec_common.c
> +++ b/lib/fdtdec_common.c
> @@ -10,7 +10,7 @@
>
> #ifndef USE_HOSTCC
> #include <common.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <fdtdec.h>
> #else
> #include "libfdt.h"
> diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
> index cc8b918..c51ffd7 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/Makefile b/lib/libfdt/Makefile
> index 4e3e12f..edd8e64 100644
> --- a/lib/libfdt/Makefile
> +++ b/lib/libfdt/Makefile
> @@ -23,3 +23,5 @@ obj-y += fdt_ro.o
>
> # U-Boot own file
> obj-y += fdt_region.o
> +
> +ccflags-y := -I$(srctree)/scripts/dtc/libfdt
> diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c
> index 5bfc4da..70914a4 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 1be9538..d972d03 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/of_live.c b/lib/of_live.c
> index f351483..148865c 100644
> --- a/lib/of_live.c
> +++ b/lib/of_live.c
> @@ -10,7 +10,7 @@
> */
>
> #include <common.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include <of_live.h>
> #include <malloc.h>
> #include <dm/of_access.h>
> diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py
> index dc9c0d9..c5767e5 100644
> --- a/tools/dtoc/dtb_platdata.py
> +++ b/tools/dtoc/dtb_platdata.py
> @@ -422,7 +422,7 @@ class DtbPlatdata(object):
> """
> self.out_header()
> 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/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
> index 41ed80e..0553b5c 100644
> --- a/tools/dtoc/test_dtoc.py
> +++ b/tools/dtoc/test_dtoc.py
> @@ -33,7 +33,7 @@ HEADER = '''/*
> */
>
> #include <stdbool.h>
> -#include <libfdt.h>'''
> +#include <linux/libfdt.h>'''
>
> C_HEADER = '''/*
> * DO NOT MODIFY
> diff --git a/tools/fdt_host.h b/tools/fdt_host.h
> index 8d4aa06..98acf27 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"
>
> /**
> diff --git a/tools/ifdtool.c b/tools/ifdtool.c
> index 729991e..e4c2f82 100644
> --- a/tools/ifdtool.c
> +++ b/tools/ifdtool.c
> @@ -19,7 +19,7 @@
> #include <unistd.h>
> #include <sys/types.h>
> #include <sys/stat.h>
> -#include <libfdt.h>
> +#include <linux/libfdt.h>
> #include "ifdtool.h"
>
> #undef DEBUG
--
Paul Kocialkowski, Bootlin (formerly Free Electrons)
Embedded Linux and kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 484 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180306/a6c1efa1/attachment-0001.sig>
next prev parent reply other threads:[~2018-03-06 8:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-04 16:20 [U-Boot] [PATCH] libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h> Masahiro Yamada
2018-03-04 16:47 ` christophe leroy
2018-03-05 18:53 ` [U-Boot] " Tom Rini
2018-03-06 8:39 ` Paul Kocialkowski [this message]
2018-03-06 14:27 ` [U-Boot] [PATCH] " Tom Rini
2018-03-06 15:29 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1520325595.2018.23.camel@bootlin.com \
--to=paul.kocialkowski@bootlin.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.