diff options
author | Jun Nie <jun.nie@linaro.org> | 2018-07-04 23:47:08 +0800 |
---|---|---|
committer | Jun Nie <jun.nie@linaro.org> | 2018-07-05 10:46:47 +0800 |
commit | f3acbea45b9573fc474eab11ced203deb0d1057d (patch) | |
tree | 987daeb76ef27698f300615d45f3c2f443b3b391 | |
parent | 656b87f1a7093f3205435a58fcef4d61de3db2f2 (diff) |
libfdt: use internal libfdt headerlinaro-20180712-001linaro-bpi
U-Boot failed to build host tools because tools include libfdt
headers from /usr/include/ instead of using internal ones.
Signed-off-by: Jun Nie <jun.nie@linaro.org>
201 files changed, 216 insertions, 215 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index d21ad39f8a..eb3e287b7d 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 707dad4829..204187c1b4 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 f5f4840f19..b8cf1b3c21 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 ec1c9b8ddb..195901a7a7 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 704849bd0c..cb077be3ec 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 05e0ad6e70..5502ea23c9 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 590e92f4e1..777e7b36dc 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 22b244079b..c245c6d72f 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 e89c6aace9..3d6d69a096 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 69cb21d052..3c84043a2c 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 6499eec4ea..b9214f7bd9 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 38e7d33cb3..ce7e913b70 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 02e8243800..fa99dc76d3 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 9297e9db48..3c368ba93b 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 1e556da9be..3aae94d560 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 00eff90275..692466c3e1 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 49b26b3570..9cc3799dd2 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_init.c b/arch/arm/mach-uniphier/board_init.c index 884bc67654..bcd3c63ae6 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -7,7 +7,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <linux/io.h> #include "init.h" diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 4bfa10b374..9a4f3633e7 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -8,7 +8,7 @@ #include <common.h> #include <spl.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <nand.h> #include <linux/io.h> #include <../drivers/mtd/nand/denali.h> diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c index 78de256a01..c9c2c62587 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 cb82621ec4..3bdebd845c 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 3ac4eb1dd8..5250571250 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 c7ea94cab5..bf41c69d88 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 caa0bf9bdc..a0a9a32b40 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 7a4465fefc..6cfe2f6759 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 3777c6faa1..abb12837d2 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 30fbf14f1b..948ad8fa1c 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 1e0ea28a91..1120fd7441 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 f9b74ded5a..9c46762418 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 9cc1676b60..1f928bd136 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 0e204027af..9341c81182 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 eefed2ebd9..57808fc761 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 eac5b781e9..8813258754 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 0d086e87fa..8377053164 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 c7adf950f5..b143e04097 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 5cb97b4778..7d593cff02 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -766,7 +766,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 cbe355a600..301be366c0 100644 --- a/board/el/el6x/el6x.c +++ b/board/el/el6x/el6x.c @@ -480,7 +480,7 @@ int checkboard(void) #ifdef CONFIG_SPL_BUILD #include <spl.h> -#include <libfdt.h> +#include <linux/libfdt.h> const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = { .dram_sdclk_0 = 0x00020030, diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c index 36a55195df..35a1538c00 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 d9ccac7a6a..1216d63299 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 fb8bb39d87..8a94ac37b9 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 a7772c4bf4..fdd66b8252 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 45f463f01f..2ef87d1c00 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 571dfbbaad..90bd7bc9e2 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 b5025ab14e..e6952b5e55 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 9f4f808376..ccea8b17cf 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 5c3c59375c..f3e0fb2cd5 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 bf263761f1..e2767d4336 100644 --- a/board/freescale/ls1043aqds/eth.c +++ b/board/freescale/ls1043aqds/eth.c @@ -11,7 +11,7 @@ #include <fm_eth.h> #include <fsl_mdio.h> #include <fsl_dtsec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <malloc.h> #include <asm/arch/fsl_serdes.h> diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c index 41417e9dc6..e1da73fb1a 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 f36fb9810b..a2b700f1bf 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 df2d768718..d4d6a90301 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 b4a0dd5d1a..93c7200509 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 8974378326..6587c6f41a 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 22f1565b4c..52e2ce3bdd 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 f30a1510ee..eee1a669bf 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 b49e03e4f9..c960228701 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 5f502e2a65..2dc26f2bf7 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 895e9ffda6..2818c5d5ee 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 233049227f..7a470647fd 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 cede1da634..51cb637606 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 7b264dddd1..33ced17a64 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 66fb228a90..a283365ba7 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 de76d36174..7574b1d4a0 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 de5f5669e6..9c74bfdd1d 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 a5c5d9dd1a..4ad4270899 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 122490c026..8e72864bec 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 ed6836a930..5ce43a126c 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 d97562c849..0c307793bf 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 2604a51e91..2714cacfbe 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 a5703a35b1..099763b476 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -776,7 +776,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 e4160420fa..23d63e35a6 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -722,7 +722,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 8afd5da49f..635b20dff0 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -303,7 +303,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 2aeef61ffd..47367846c0 100644 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c @@ -548,7 +548,7 @@ int checkboard(void) } #ifdef CONFIG_SPL_BUILD -#include <libfdt.h> +#include <linux/libfdt.h> #include <spl.h> #include <asm/arch/mx6-ddr.h> diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index a30c379e4d..283533c8c0 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 65bb575a96..377654f9b4 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 345feac0b2..6b280600aa 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 0451722603..17aad34f34 100644 --- a/board/freescale/p1023rdb/p1023rdb.c +++ b/board/freescale/p1023rdb/p1023rdb.c @@ -18,7 +18,7 @@ #include <asm/fsl_pci.h> #include <fsl_ddr_sdram.h> #include <asm/fsl_portals.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <netdev.h> #include <malloc.h> diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 51217c58e5..f3309a2263 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 f54a6ff8dc..d1e5e8190b 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 0c65ec72d2..80bf780ca9 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 7369289618..5ece77993d 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 ba7041af95..f13d41c77d 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 c53e3b76a4..68ee74b785 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 c53e3b76a4..68ee74b785 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 84a89dad4f..5a6731c12b 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 ba7041af95..f13d41c77d 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 08d74b444a..398c62bc48 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 6387a20cae..36cff0dac4 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 c6566e9196..741bc47cb1 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 34e9d1956e..21a64f2ad5 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 01064dcfde..8035284a33 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 4433e8c77e..67818931f0 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 8020c379fd..d92a8744fb 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 b827e43a7a..b2c3679719 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/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c index 234a387801..e96645f82d 100644 --- a/board/mpc8308_p1m/mpc8308_p1m.c +++ b/board/mpc8308_p1m/mpc8308_p1m.c @@ -7,7 +7,7 @@ #include <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 4257fbcb68..61130bdf91 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/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c index a3395ed680..ef87f9f0fe 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 25329e4473..1a48a6c89f 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 08ced102b6..b58e123f1f 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 fb691c22d9..025fbbed32 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 5032e03935..56275df5ec 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -28,7 +28,7 @@ #include <asm/io.h> #include <crc.h> #include <environment.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <nand.h> #include <net.h> #include <sy8106a.h> diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 8e5613cb12..67ada4faaf 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -890,7 +890,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 cbf7aa952a..bbdab31c97 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -741,7 +741,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 0d267877fa..696db25eb3 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 fcdea34f05..7426090ec5 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 1188215738..be4c132fbe 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 2360cffdd9..128748fcab 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 276c625cfd..0b9c2e0fa6 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 4780e8c147..1853b197e7 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 3818ab96b3..bb5574c190 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 d3b1f1564f..6c0813ba00 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 62375717f0..45924cdb48 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 6a3df52391..4b3a46c8cb 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 41419feb17..ae606f5ba7 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 1f05150d0f..c90bb89dae 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 d20775eccd..40e951ae04 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -11,8 +11,8 @@ #include <dm.h> #include <efi_loader.h> #include <errno.h> -#include <libfdt.h> -#include <libfdt_env.h> +#include <linux/libfdt.h> +#include <linux/libfdt_env.h> #include <memalign.h> #include <asm/global_data.h> #include <asm-generic/sections.h> @@ -13,7 +13,7 @@ #include <linux/ctype.h> #include <linux/types.h> #include <asm/global_data.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <mapmem.h> #include <asm/io.h> diff --git a/common/board_info.c b/common/board_info.c index aa45e24b34..16cf966233 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 51440a6e6f..ea0d6bb2d9 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> int fdt_offset(void *fit) { diff --git a/common/bootm_os.c b/common/bootm_os.c index d9e6e937f7..f3c14f1d43 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 61479d7f07..bef293ce4f 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 5f5f3f9a44..5d09aba42d 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 7ccf8b19fd..bdbad6439d 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 c6e8832d66..58855670e6 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 59dd58c451..58c44de437 100644 --- a/common/image.c +++ b/common/image.c @@ -30,7 +30,7 @@ #include <mapmem.h> #if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <fpga.h> #include <xilinx.h> diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c index d7e9fc9f65..81f3f42191 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 5e312160d9..3c1841bc75 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 2624b6aa0a..0e9fdff1a7 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> /** diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index cd39f9be9d..d075985374 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 85fe508b17..1b986e9e6f 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 b2645a1948..1b1a16c9c1 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -12,7 +12,7 @@ */ #include <common.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 ff8085b795..4ab3dcd624 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 c31cba7fd6..9389199a2a 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 4757066967..7513ea2cf7 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 0381909848..ca2e92b32b 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 c1a2e9f0da..25f91ab355 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 d4e16a27ef..bd6b2c120a 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 d691d6ff94..f572148e3d 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 2e232d57a1..f87aab63df 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 0940faf768..470e662d8e 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 451fbdebba..54813c41af 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/psci.h> diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c index 40f7892ac8..27bcf1376a 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 f31d329c81..3275e455e8 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -10,7 +10,7 @@ #include <dm.h> #include <dt-structs.h> #include <fdtdec.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 62817a0d07..96bac9d509 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 f83c1d7241..e027642008 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -10,7 +10,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 759686ccd6..9ace505fe4 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/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c index 2b7cb7f6b6..93db5bf772 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 0fddb420dc..4a5600f31f 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/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 8bf25c7040..ae845cb59f 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 af20cf0f3e..30029282da 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 0f8e3c9fcb..dcea192418 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 9e6c2f5dfc..b4a5ac6bc6 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/pci/tsi108_pci.c b/drivers/pci/tsi108_pci.c index d48e1e6fe6..bce8b79b68 100644 --- a/drivers/pci/tsi108_pci.c +++ b/drivers/pci/tsi108_pci.c @@ -16,7 +16,7 @@ #include <asm/io.h> #include <tsi108.h> #if defined(CONFIG_OF_LIBFDT) -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #endif diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index a38d774ddc..72f99be7e6 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 114952a1da..6a73a0679b 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 a6b0940956..7d107f4427 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/rk8xx.c b/drivers/power/pmic/rk8xx.c index eb3ec0f601..81b1ef1749 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -9,7 +9,7 @@ #include <dm.h> #include <errno.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <power/rk8xx_pmic.h> #include <power/pmic.h> diff --git a/drivers/power/pmic/rn5t567.c b/drivers/power/pmic/rn5t567.c index 001e69553e..9e5b0b119b 100644 --- a/drivers/power/pmic/rn5t567.c +++ b/drivers/power/pmic/rn5t567.c @@ -9,7 +9,7 @@ #include <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 b63f941990..169f09558d 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 4f48f984ab..9bbdc60353 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 749bbbd031..be69fb0b01 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 35c2dc18d9..1b99d4810d 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <linux/usb/otg.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 30297b02d3..a2c6d5abfb 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 2c0c63322c..79f655889e 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 1c72330b0c..f317cf00ea 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 5bb3763814..3d63cfa193 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 bf7286554e..6f08d5d5a2 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -16,7 +16,7 @@ #include <common.h> #include <dm.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <malloc.h> #include <usb.h> #include <watchdog.h> diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c index ec55f4e59f..3ac65980a5 100644 --- a/drivers/usb/host/xhci-rockchip.c +++ b/drivers/usb/host/xhci-rockchip.c @@ -7,7 +7,7 @@ #include <common.h> #include <dm.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <malloc.h> #include <usb.h> #include <watchdog.h> diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c index 1958478d62..01bda15bd6 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 092342e7ad..f7a1116a30 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 aae78a8159..f84dd7097f 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 6ca17f2db2..a2879a9c57 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 a5d9b59218..724d08f7ae 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 5ef78cce6e..c1a5162923 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 4a0947c626..ef666b7230 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 43b026efb3..1705553a80 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/linux/libfdt.h index 10296a21ad..10296a21ad 100644 --- a/include/libfdt.h +++ b/include/linux/libfdt.h diff --git a/include/libfdt_env.h b/include/linux/libfdt_env.h index 6c6845f76c..7094a596b3 100644 --- a/include/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -9,8 +9,8 @@ #ifndef _LIBFDT_ENV_H #define _LIBFDT_ENV_H -#include "compiler.h" -#include "linux/types.h" +#include "../compiler.h" +#include "types.h" extern struct fdt_header *working_fdt; /* Pointer to the working fdt */ diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 59479eddb9..387e1a2716 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -10,7 +10,7 @@ #include <efi_loader.h> #include <malloc.h> #include <asm/global_data.h> -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #include <u-boot/crc.h> #include <bootm.h> #include <inttypes.h> diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 9e079f1fa3..402ab7fd56 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 d2dbd0f122..cc8af40509 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -9,7 +9,7 @@ #include <dm.h> #include <errno.h> #include <serial.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <fdtdec.h> #include <asm/sections.h> diff --git a/lib/fdtdec_common.c b/lib/fdtdec_common.c index 63b704a3d7..2d083418e0 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 cc8b918f64..c51ffd7ecf 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 6ef8290f4e..b04440439f 100644 --- a/lib/libfdt/Makefile +++ b/lib/libfdt/Makefile @@ -16,4 +16,5 @@ obj-y += \ fdt_addresses.o \ fdt_region.o +ccflags-y := -I$(srctree)/scripts/dtc/libfdt obj-$(CONFIG_OF_LIBFDT_OVERLAY) += fdt_overlay.o diff --git a/lib/libfdt/fdt.c b/lib/libfdt/fdt.c index 2055734012..2fdd92b342 100644 --- a/lib/libfdt/fdt.c +++ b/lib/libfdt/fdt.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #ifndef USE_HOSTCC #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_addresses.c b/lib/libfdt/fdt_addresses.c index b6bc66ea32..e1e7a5bac0 100644 --- a/lib/libfdt/fdt_addresses.c +++ b/lib/libfdt/fdt_addresses.c @@ -3,11 +3,11 @@ * Copyright (C) 2014 David Gibson <david@gibson.dropbear.id.au> * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #ifndef USE_HOSTCC #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_empty_tree.c b/lib/libfdt/fdt_empty_tree.c index 6fde1eb9ed..e6ca82c162 100644 --- a/lib/libfdt/fdt_empty_tree.c +++ b/lib/libfdt/fdt_empty_tree.c @@ -3,9 +3,9 @@ * Copyright (C) 2012 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include "libfdt_internal.h" diff --git a/lib/libfdt/fdt_overlay.c b/lib/libfdt/fdt_overlay.c index ceb968786e..6da3c55427 100644 --- a/lib/libfdt/fdt_overlay.c +++ b/lib/libfdt/fdt_overlay.c @@ -1,7 +1,7 @@ -#include "libfdt_env.h" +#include "linux/libfdt_env.h" #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include "libfdt_internal.h" diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c index 63099f1d96..96be73ab2e 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 1be9538fd2..d972d031c6 100644 --- a/lib/libfdt/fdt_ro.c +++ b/lib/libfdt/fdt_ro.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #ifndef USE_HOSTCC #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c index 80a3212141..af4ccf0a85 100644 --- a/lib/libfdt/fdt_rw.c +++ b/lib/libfdt/fdt_rw.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #ifndef USE_HOSTCC #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c index f89004c609..b2e6129930 100644 --- a/lib/libfdt/fdt_strerror.c +++ b/lib/libfdt/fdt_strerror.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #ifndef USE_HOSTCC #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c index 70fd026550..5fcd79377c 100644 --- a/lib/libfdt/fdt_sw.c +++ b/lib/libfdt/fdt_sw.c @@ -3,9 +3,9 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include "libfdt_internal.h" diff --git a/lib/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c index 45fb964120..cb8ee96f5a 100644 --- a/lib/libfdt/fdt_wip.c +++ b/lib/libfdt/fdt_wip.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #ifndef USE_HOSTCC #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/libfdt.h b/lib/libfdt/libfdt.h index f3f9cad184..a05e92a587 100644 --- a/lib/libfdt/libfdt.h +++ b/lib/libfdt/libfdt.h @@ -7,7 +7,7 @@ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #include <fdt.h> #define FDT_FIRST_SUPPORTED_VERSION 0x10 diff --git a/lib/of_live.c b/lib/of_live.c index f351483387..148865c967 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/Makefile b/tools/Makefile index fe6e102ff1..2eaf753ebf 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -268,7 +268,7 @@ endif # !LOGO_BMP # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps # Define _GNU_SOURCE to obtain the getline prototype from stdio.h # -HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ +HOST_EXTRACFLAGS += -include $(srctree)/include/linux/libfdt_env.h \ $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ -I$(srctree)/lib/libfdt \ -I$(srctree)/tools \ diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index 1f85343a9f..5cb2d43c59 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -323,7 +323,7 @@ class DtbPlatdata(object): README.of-plat for more information. """ self.out('#include <stdbool.h>\n') - self.out('#include <libfdt.h>\n') + self.out('#include <linux/libfdt.h>\n') # Output the struct definition for name in sorted(structs): diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 8b95c4124f..864ee2f1c9 100644 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -104,7 +104,7 @@ class TestDtoc(unittest.TestCase): dtb_platdata.run_steps(['struct'], dtb_file, False, output) with open(output) as infile: lines = infile.read().splitlines() - self.assertEqual(['#include <stdbool.h>', '#include <libfdt.h>'], lines) + self.assertEqual(['#include <stdbool.h>', '#include <linux/libfdt.h>'], lines) dtb_platdata.run_steps(['platdata'], dtb_file, False, output) with open(output) as infile: @@ -120,7 +120,7 @@ class TestDtoc(unittest.TestCase): with open(output) as infile: data = infile.read() self.assertEqual('''#include <stdbool.h> -#include <libfdt.h> +#include <linux/libfdt.h> struct dtd_sandbox_spl_test { \tbool\t\tboolval; \tunsigned char\tbytearray[3]; @@ -200,7 +200,7 @@ U_BOOT_DEVICE(spl_test4) = { with open(output) as infile: data = infile.read() self.assertEqual('''#include <stdbool.h> -#include <libfdt.h> +#include <linux/libfdt.h> struct dtd_source { \tstruct phandle_2_cell clocks[1]; }; @@ -244,7 +244,7 @@ U_BOOT_DEVICE(phandle_source) = { with open(output) as infile: data = infile.read() self.assertEqual('''#include <stdbool.h> -#include <libfdt.h> +#include <linux/libfdt.h> struct dtd_compat1 { \tfdt32_t\t\tintval; }; diff --git a/tools/fdt_host.h b/tools/fdt_host.h index 134d965713..d8ea8de1ec 100644 --- a/tools/fdt_host.h +++ b/tools/fdt_host.h @@ -8,7 +8,7 @@ #define __FDT_HOST_H__ /* Make sure to include u-boot version of libfdt include files */ -#include "../include/libfdt.h" +#include "../include/linux/libfdt.h" #include "../include/fdt_support.h" int fit_check_sign(const void *working_fdt, const void *key); diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index f51f5f15f5..26a63ac5ab 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -16,7 +16,7 @@ #include <string.h> #include <unistd.h> -#include <../include/libfdt.h> +#include <../include/linux/libfdt.h> #include <libfdt_internal.h> /* Define DEBUG to get some debugging output on stderr */ diff --git a/tools/ifdtool.c b/tools/ifdtool.c index 195b1533ab..c805597744 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -18,7 +18,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include "ifdtool.h" #undef DEBUG |