projects / openwrt / openwrt.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
omap: switch to kernel 4.19
[openwrt/openwrt.git] / package / boot / uboot-omap / patches / 106-backport-from-upstream-b08c8c4870831c9315dcae2377722.patch
1 From 5da90396c3bfdc3530e0b54d4cd284deb03f806e Mon Sep 17 00:00:00 2001
2 From: Alexander Couzens <lynxis@fe80.eu>
3 Date: Sun, 10 Mar 2019 17:38:22 +0100
4 Subject: [PATCH 1/2] backport from upstream
5 b08c8c4870831c9315dcae237772238e80035bd5
6
7 Fix build if libfdt-devel is installed
8 ---
9 arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +-
10 arch/arm/cpu/armv7/virt-dt.c | 2 +-
11 arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +-
12 arch/arm/cpu/armv8/spin_table.c | 2 +-
13 arch/arm/lib/bootm.c | 2 +-
14 arch/arm/lib/psci-dt.c | 2 +-
15 arch/arm/mach-litesom/litesom.c | 2 +-
16 arch/arm/mach-meson/board.c | 2 +-
17 arch/arm/mach-mvebu/arm64-common.c | 2 +-
18 arch/arm/mach-mvebu/armada3700/cpu.c | 2 +-
19 arch/arm/mach-mvebu/armada8k/cpu.c | 2 +-
20 arch/arm/mach-omap2/omap5/fdt.c | 2 +-
21 arch/arm/mach-socfpga/misc.c | 2 +-
22 arch/arm/mach-uniphier/board_init.c | 2 +-
23 arch/arm/mach-uniphier/board_late_init.c | 2 +-
24 arch/arm/mach-uniphier/boards.c | 2 +-
25 arch/arm/mach-uniphier/dram_init.c | 2 +-
26 arch/nios2/cpu/fdt.c | 2 +-
27 arch/powerpc/cpu/mpc512x/pci.c | 2 +-
28 arch/powerpc/cpu/mpc5xxx/cpu.c | 2 +-
29 arch/powerpc/cpu/mpc8260/cpu.c | 2 +-
30 arch/powerpc/cpu/mpc8260/pci.c | 2 +-
31 arch/powerpc/cpu/mpc83xx/cpu.c | 2 +-
32 arch/powerpc/cpu/mpc83xx/fdt.c | 2 +-
33 arch/powerpc/cpu/mpc83xx/pci.c | 2 +-
34 arch/powerpc/cpu/mpc85xx/fdt.c | 2 +-
35 arch/powerpc/cpu/mpc85xx/liodn.c | 2 +-
36 arch/powerpc/cpu/mpc85xx/portals.c | 2 +-
37 arch/powerpc/cpu/mpc86xx/fdt.c | 2 +-
38 arch/powerpc/cpu/mpc8xx/cpu.c | 2 +-
39 arch/powerpc/cpu/mpc8xx/fdt.c | 2 +-
40 arch/powerpc/cpu/mpc8xxx/fdt.c | 2 +-
41 arch/powerpc/cpu/ppc4xx/fdt.c | 2 +-
42 arch/powerpc/lib/bootm.c | 2 +-
43 arch/sandbox/cpu/cpu.c | 2 +-
44 arch/x86/cpu/intel_common/microcode.c | 2 +-
45 board/Arcturus/ucp1020/ucp1020.c | 2 +-
46 board/a4m072/a4m072.c | 2 +-
47 board/amcc/canyonlands/canyonlands.c | 2 +-
48 board/amcc/katmai/katmai.c | 2 +-
49 board/amcc/kilauea/kilauea.c | 2 +-
50 board/amcc/makalu/makalu.c | 2 +-
51 board/amcc/sequoia/sequoia.c | 2 +-
52 board/amcc/yosemite/yosemite.c | 2 +-
53 board/armltd/vexpress/vexpress_tc2.c | 2 +-
54 board/cm5200/cm5200.c | 2 +-
55 board/congatec/cgtqmx6eval/cgtqmx6eval.c | 2 +-
56 board/el/el6x/el6x.c | 2 +-
57 board/engicam/geam6ul/geam6ul.c | 2 +-
58 board/engicam/icorem6/icorem6.c | 2 +-
59 board/engicam/icorem6_rqs/icorem6_rqs.c | 2 +-
60 board/esd/cpci405/cpci405.c | 2 +-
61 board/esd/pmc405de/pmc405de.c | 2 +-
62 board/esd/pmc440/pmc440.c | 2 +-
63 board/esd/vme8349/vme8349.c | 2 +-
64 board/freescale/b4860qds/pci.c | 2 +-
65 board/freescale/bsc9131rdb/bsc9131rdb.c | 2 +-
66 board/freescale/bsc9132qds/bsc9132qds.c | 2 +-
67 board/freescale/c29xpcie/c29xpcie.c | 2 +-
68 board/freescale/common/cds_pci_ft.c | 2 +-
69 board/freescale/common/fman.c | 4 ++--
70 board/freescale/common/p_corenet/pci.c | 2 +-
71 board/freescale/common/sgmii_riser.c | 2 +-
72 board/freescale/ls1043aqds/eth.c | 2 +-
73 board/freescale/ls2080a/ls2080a.c | 2 +-
74 board/freescale/ls2080aqds/ls2080aqds.c | 2 +-
75 board/freescale/ls2080ardb/ls2080ardb.c | 2 +-
76 board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +-
77 board/freescale/mpc8313erdb/mpc8313erdb.c | 2 +-
78 board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +-
79 board/freescale/mpc8323erdb/mpc8323erdb.c | 2 +-
80 board/freescale/mpc832xemds/mpc832xemds.c | 2 +-
81 board/freescale/mpc8349emds/mpc8349emds.c | 2 +-
82 board/freescale/mpc8349itx/mpc8349itx.c | 2 +-
83 board/freescale/mpc837xemds/mpc837xemds.c | 2 +-
84 board/freescale/mpc8536ds/mpc8536ds.c | 2 +-
85 board/freescale/mpc8540ads/mpc8540ads.c | 2 +-
86 board/freescale/mpc8541cds/mpc8541cds.c | 2 +-
87 board/freescale/mpc8544ds/mpc8544ds.c | 2 +-
88 board/freescale/mpc8548cds/mpc8548cds.c | 2 +-
89 board/freescale/mpc8555cds/mpc8555cds.c | 2 +-
90 board/freescale/mpc8560ads/mpc8560ads.c | 2 +-
91 board/freescale/mpc8568mds/mpc8568mds.c | 2 +-
92 board/freescale/mpc8569mds/mpc8569mds.c | 2 +-
93 board/freescale/mpc8572ds/mpc8572ds.c | 2 +-
94 board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +-
95 board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +-
96 board/freescale/mx6sabresd/mx6sabresd.c | 2 +-
97 board/freescale/mx6slevk/mx6slevk.c | 2 +-
98 board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +-
99 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +-
100 board/freescale/p1010rdb/p1010rdb.c | 2 +-
101 board/freescale/p1022ds/p1022ds.c | 2 +-
102 board/freescale/p1023rdb/p1023rdb.c | 2 +-
103 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
104 board/freescale/p1_twr/p1_twr.c | 2 +-
105 board/freescale/qemu-ppce500/qemu-ppce500.c | 2 +-
106 board/freescale/t102xqds/pci.c | 2 +-
107 board/freescale/t102xrdb/pci.c | 2 +-
108 board/freescale/t1040qds/pci.c | 2 +-
109 board/freescale/t104xrdb/pci.c | 2 +-
110 board/freescale/t208xqds/pci.c | 2 +-
111 board/freescale/t208xrdb/pci.c | 2 +-
112 board/freescale/t4qds/pci.c | 2 +-
113 board/freescale/t4rdb/pci.c | 2 +-
114 board/gdsys/405ex/io64.c | 2 +-
115 board/gdsys/intip/intip.c | 2 +-
116 board/gdsys/mpc8308/hrcon.c | 2 +-
117 board/gdsys/mpc8308/strider.c | 2 +-
118 board/gdsys/p1022/controlcenterd.c | 2 +-
119 board/ids/ids8313/ids8313.c | 2 +-
120 board/ifm/o2dnt2/o2dnt2.c | 2 +-
121 board/intercontrol/digsy_mtc/digsy_mtc.c | 2 +-
122 board/ipek01/ipek01.c | 2 +-
123 board/jupiter/jupiter.c | 2 +-
124 board/keymile/km82xx/km82xx.c | 2 +-
125 board/keymile/km83xx/km83xx.c | 2 +-
126 board/keymile/kmp204x/pci.c | 2 +-
127 board/mosaixtech/icon/icon.c | 2 +-
128 board/motionpro/motionpro.c | 2 +-
129 board/mpc8308_p1m/mpc8308_p1m.c | 2 +-
130 board/phytec/pcm058/pcm058.c | 2 +-
131 board/sbc8349/sbc8349.c | 2 +-
132 board/sbc8548/sbc8548.c | 2 +-
133 board/sbc8641d/sbc8641d.c | 2 +-
134 board/socrates/socrates.c | 2 +-
135 board/sunxi/board.c | 2 +-
136 board/t3corp/t3corp.c | 2 +-
137 board/toradex/apalis_imx6/apalis_imx6.c | 2 +-
138 board/toradex/colibri_imx6/colibri_imx6.c | 2 +-
139 board/toradex/common/tdx-common.c | 2 +-
140 board/tqc/tqm5200/tqm5200.c | 2 +-
141 board/tqc/tqm8xx/tqm8xx.c | 2 +-
142 board/tqc/tqma6/tqma6.c | 2 +-
143 board/tqc/tqma6/tqma6_mba6.c | 2 +-
144 board/tqc/tqma6/tqma6_wru4.c | 2 +-
145 board/udoo/neo/neo.c | 2 +-
146 board/varisys/cyrus/pci.c | 2 +-
147 board/ve8313/ve8313.c | 2 +-
148 board/vscom/baltos/board.c | 2 +-
149 board/xes/common/fsl_8xxx_pci.c | 2 +-
150 board/xes/xpedite520x/xpedite520x.c | 2 +-
151 board/xes/xpedite537x/xpedite537x.c | 2 +-
152 board/xes/xpedite550x/xpedite550x.c | 2 +-
153 cmd/bootefi.c | 4 ++--
154 cmd/fdt.c | 2 +-
155 common/board_info.c | 2 +-
156 common/bootm_os.c | 2 +-
157 common/bootstage.c | 2 +-
158 common/fdt_support.c | 2 +-
159 common/image-fdt.c | 2 +-
160 common/image.c | 4 ++--
161 common/lcd_simplefb.c | 2 +-
162 common/spl/spl_fat.c | 2 +-
163 common/spl/spl_fit.c | 2 +-
164 common/spl/spl_nand.c | 2 +-
165 common/spl/spl_ymodem.c | 2 +-
166 drivers/core/regmap.c | 2 +-
167 drivers/core/root.c | 2 +-
168 drivers/crypto/fsl/sec.c | 2 +-
169 drivers/mmc/exynos_dw_mmc.c | 2 +-
170 drivers/mmc/rockchip_sdhci.c | 2 +-
171 drivers/mmc/s5p_sdhci.c | 2 +-
172 drivers/mmc/socfpga_dw_mmc.c | 2 +-
173 drivers/mmc/zynq_sdhci.c | 2 +-
174 drivers/net/fsl-mc/mc.c | 2 +-
175 drivers/pci/fsl_pci_init.c | 2 +-
176 drivers/pci/pci-emul-uclass.c | 2 +-
177 drivers/pci/pcie_layerscape.c | 2 +-
178 drivers/pci/tsi108_pci.c | 2 +-
179 drivers/pinctrl/pinctrl-uclass.c | 2 +-
180 drivers/power/pmic/act8846.c | 2 +-
181 drivers/power/pmic/rk808.c | 2 +-
182 drivers/power/pmic/rn5t567.c | 2 +-
183 drivers/power/regulator/pwm_regulator.c | 2 +-
184 drivers/qe/fdt.c | 2 +-
185 drivers/sound/sound-i2s.c | 2 +-
186 drivers/usb/common/common.c | 2 +-
187 drivers/usb/host/ehci-exynos.c | 2 +-
188 drivers/usb/host/ehci-msm.c | 2 +-
189 drivers/usb/host/ehci-tegra.c | 2 +-
190 drivers/usb/host/ehci-vf.c | 2 +-
191 drivers/usb/host/xhci-exynos5.c | 2 +-
192 drivers/usb/host/xhci-rockchip.c | 2 +-
193 drivers/usb/phy/rockchip_usb2_phy.c | 2 +-
194 drivers/video/exynos/exynos_dp.c | 2 +-
195 drivers/video/exynos/exynos_dp_lowlevel.c | 2 +-
196 drivers/video/exynos/exynos_fb.c | 2 +-
197 drivers/video/exynos/exynos_mipi_dsi.c | 2 +-
198 include/fdt_support.h | 2 +-
199 include/fdtdec.h | 2 +-
200 include/image.h | 2 +-
201 include/{ => linux}/libfdt.h | 2 +-
202 include/{ => linux}/libfdt_env.h | 4 ++--
203 lib/efi_loader/efi_boottime.c | 2 +-
204 lib/efi_loader/efi_memory.c | 2 +-
205 lib/fdtdec.c | 2 +-
206 lib/fdtdec_common.c | 4 ++--
207 lib/fdtdec_test.c | 2 +-
208 lib/libfdt/fdt.c | 4 ++--
209 lib/libfdt/fdt_addresses.c | 4 ++--
210 lib/libfdt/fdt_empty_tree.c | 4 ++--
211 lib/libfdt/fdt_overlay.c | 4 ++--
212 lib/libfdt/fdt_region.c | 4 ++--
213 lib/libfdt/fdt_ro.c | 4 ++--
214 lib/libfdt/fdt_rw.c | 4 ++--
215 lib/libfdt/fdt_strerror.c | 4 ++--
216 lib/libfdt/fdt_sw.c | 4 ++--
217 lib/libfdt/fdt_wip.c | 4 ++--
218 lib/libfdt/libfdt.swig | 2 +-
219 tools/Makefile | 2 +-
220 tools/dtoc/dtoc.py | 2 +-
221 tools/fdt_host.h | 2 +-
222 tools/fdtgrep.c | 2 +-
223 tools/ifdtool.c | 2 +-
224 215 files changed, 230 insertions(+), 230 deletions(-)
225 rename include/{ => linux}/libfdt.h (99%)
226 rename include/{ => linux}/libfdt_env.h (94%)
227
228 diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
229 index ae5e794230cd..e64ac9185b43 100644
230 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c
231 +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
232 @@ -5,7 +5,7 @@
233 */
234
235 #include <common.h>
236 -#include <libfdt.h>
237 +#include <linux/libfdt.h>
238 #include <fdt_support.h>
239 #include <asm/io.h>
240 #include <asm/processor.h>
241 diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c
242 index 707dad4829a9..204187c1b4b3 100644
243 --- a/arch/arm/cpu/armv7/virt-dt.c
244 +++ b/arch/arm/cpu/armv7/virt-dt.c
245 @@ -21,7 +21,7 @@
246 #include <linux/ctype.h>
247 #include <linux/types.h>
248 #include <asm/global_data.h>
249 -#include <libfdt.h>
250 +#include <linux/libfdt.h>
251 #include <fdt_support.h>
252 #include <asm/armv7.h>
253 #include <asm/psci.h>
254 diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
255 index c10ccf9063a6..33a7504bb604 100644
256 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
257 +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
258 @@ -6,7 +6,7 @@
259
260 #include <common.h>
261 #include <efi_loader.h>
262 -#include <libfdt.h>
263 +#include <linux/libfdt.h>
264 #include <fdt_support.h>
265 #include <phy.h>
266 #ifdef CONFIG_FSL_LSCH3
267 diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c
268 index ec1c9b8ddb6f..195901a7a715 100644
269 --- a/arch/arm/cpu/armv8/spin_table.c
270 +++ b/arch/arm/cpu/armv8/spin_table.c
271 @@ -6,7 +6,7 @@
272 */
273
274 #include <common.h>
275 -#include <libfdt.h>
276 +#include <linux/libfdt.h>
277 #include <asm/spin_table.h>
278
279 int spin_table_update_dt(void *fdt)
280 diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
281 index 43cc83ec95b6..294ee3f2736e 100644
282 --- a/arch/arm/lib/bootm.c
283 +++ b/arch/arm/lib/bootm.c
284 @@ -17,7 +17,7 @@
285 #include <image.h>
286 #include <u-boot/zlib.h>
287 #include <asm/byteorder.h>
288 -#include <libfdt.h>
289 +#include <linux/libfdt.h>
290 #include <mapmem.h>
291 #include <fdt_support.h>
292 #include <asm/bootm.h>
293 diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
294 index 45af037f0a48..601f2bae3ee4 100644
295 --- a/arch/arm/lib/psci-dt.c
296 +++ b/arch/arm/lib/psci-dt.c
297 @@ -5,7 +5,7 @@
298 */
299
300 #include <common.h>
301 -#include <libfdt.h>
302 +#include <linux/libfdt.h>
303 #include <fdt_support.h>
304 #include <linux/sizes.h>
305 #include <linux/kernel.h>
306 diff --git a/arch/arm/mach-litesom/litesom.c b/arch/arm/mach-litesom/litesom.c
307 index ac2eccff06f5..db5e4d02190c 100644
308 --- a/arch/arm/mach-litesom/litesom.c
309 +++ b/arch/arm/mach-litesom/litesom.c
310 @@ -77,7 +77,7 @@ int litesom_mmc_init(bd_t *bis)
311 #endif
312
313 #ifdef CONFIG_SPL_BUILD
314 -#include <libfdt.h>
315 +#include <linux/libfdt.h>
316 #include <spl.h>
317 #include <asm/arch/mx6-ddr.h>
318
319 diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c
320 index f159cbf849f7..3b23610354c5 100644
321 --- a/arch/arm/mach-meson/board.c
322 +++ b/arch/arm/mach-meson/board.c
323 @@ -5,7 +5,7 @@
324 */
325
326 #include <common.h>
327 -#include <libfdt.h>
328 +#include <linux/libfdt.h>
329 #include <linux/err.h>
330 #include <asm/arch/gxbb.h>
331 #include <asm/arch/sm.h>
332 diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
333 index 8f026559c2f9..8260ee7884d6 100644
334 --- a/arch/arm/mach-mvebu/arm64-common.c
335 +++ b/arch/arm/mach-mvebu/arm64-common.c
336 @@ -7,7 +7,7 @@
337 #include <common.h>
338 #include <dm.h>
339 #include <fdtdec.h>
340 -#include <libfdt.h>
341 +#include <linux/libfdt.h>
342 #include <asm/io.h>
343 #include <asm/system.h>
344 #include <asm/arch/cpu.h>
345 diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
346 index 6499eec4eaf0..b9214f7bd9e1 100644
347 --- a/arch/arm/mach-mvebu/armada3700/cpu.c
348 +++ b/arch/arm/mach-mvebu/armada3700/cpu.c
349 @@ -7,7 +7,7 @@
350 #include <common.h>
351 #include <dm.h>
352 #include <fdtdec.h>
353 -#include <libfdt.h>
354 +#include <linux/libfdt.h>
355 #include <asm/io.h>
356 #include <asm/system.h>
357 #include <asm/arch/cpu.h>
358 diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c
359 index 2325e9a180ba..28c9efd20067 100644
360 --- a/arch/arm/mach-mvebu/armada8k/cpu.c
361 +++ b/arch/arm/mach-mvebu/armada8k/cpu.c
362 @@ -7,7 +7,7 @@
363 #include <common.h>
364 #include <dm.h>
365 #include <fdtdec.h>
366 -#include <libfdt.h>
367 +#include <linux/libfdt.h>
368 #include <asm/io.h>
369 #include <asm/system.h>
370 #include <asm/arch/cpu.h>
371 diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
372 index 900f0010f661..3b82b81eeb65 100644
373 --- a/arch/arm/mach-omap2/omap5/fdt.c
374 +++ b/arch/arm/mach-omap2/omap5/fdt.c
375 @@ -5,7 +5,7 @@
376 */
377
378 #include <common.h>
379 -#include <libfdt.h>
380 +#include <linux/libfdt.h>
381 #include <fdt_support.h>
382 #include <malloc.h>
383
384 diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
385 index dd6b53b24df0..1a8e49d8afa9 100644
386 --- a/arch/arm/mach-socfpga/misc.c
387 +++ b/arch/arm/mach-socfpga/misc.c
388 @@ -8,7 +8,7 @@
389 #include <asm/io.h>
390 #include <errno.h>
391 #include <fdtdec.h>
392 -#include <libfdt.h>
393 +#include <linux/libfdt.h>
394 #include <altera.h>
395 #include <miiphy.h>
396 #include <netdev.h>
397 diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
398 index 8c7864cb85d5..ad0973b4c93d 100644
399 --- a/arch/arm/mach-uniphier/board_init.c
400 +++ b/arch/arm/mach-uniphier/board_init.c
401 @@ -7,7 +7,7 @@
402 */
403
404 #include <common.h>
405 -#include <libfdt.h>
406 +#include <linux/libfdt.h>
407 #include <linux/io.h>
408
409 #include "init.h"
410 diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
411 index ece761fb948b..e2387762b746 100644
412 --- a/arch/arm/mach-uniphier/board_late_init.c
413 +++ b/arch/arm/mach-uniphier/board_late_init.c
414 @@ -8,7 +8,7 @@
415
416 #include <common.h>
417 #include <spl.h>
418 -#include <libfdt.h>
419 +#include <linux/libfdt.h>
420 #include <nand.h>
421 #include <linux/io.h>
422 #include <../drivers/mtd/nand/denali.h>
423 diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c
424 index 059645171a72..0c91d2efd6d3 100644
425 --- a/arch/arm/mach-uniphier/boards.c
426 +++ b/arch/arm/mach-uniphier/boards.c
427 @@ -6,7 +6,7 @@
428 */
429
430 #include <common.h>
431 -#include <libfdt.h>
432 +#include <linux/libfdt.h>
433 #include <linux/kernel.h>
434
435 #include "init.h"
436 diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
437 index 489366c63f94..828f205869e7 100644
438 --- a/arch/arm/mach-uniphier/dram_init.c
439 +++ b/arch/arm/mach-uniphier/dram_init.c
440 @@ -5,7 +5,7 @@
441 */
442
443 #include <common.h>
444 -#include <libfdt.h>
445 +#include <linux/libfdt.h>
446 #include <fdtdec.h>
447 #include <linux/err.h>
448
449 diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c
450 index a44f51a7f2a8..8f8abfba8c4d 100644
451 --- a/arch/nios2/cpu/fdt.c
452 +++ b/arch/nios2/cpu/fdt.c
453 @@ -13,7 +13,7 @@
454 #include <common.h>
455
456 #ifdef CONFIG_OF_BOARD_SETUP
457 -#include <libfdt.h>
458 +#include <linux/libfdt.h>
459 #include <fdt_support.h>
460
461 DECLARE_GLOBAL_DATA_PTR;
462 diff --git a/arch/powerpc/cpu/mpc512x/pci.c b/arch/powerpc/cpu/mpc512x/pci.c
463 index 7ea5df2960be..e823c1bbcedb 100644
464 --- a/arch/powerpc/cpu/mpc512x/pci.c
465 +++ b/arch/powerpc/cpu/mpc512x/pci.c
466 @@ -12,7 +12,7 @@
467 #include <asm/global_data.h>
468 #include <pci.h>
469 #if defined(CONFIG_OF_LIBFDT)
470 -#include <libfdt.h>
471 +#include <linux/libfdt.h>
472 #include <fdt_support.h>
473 #endif
474
475 diff --git a/arch/powerpc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c
476 index 84fabbd473ac..7b01b4efb26f 100644
477 --- a/arch/powerpc/cpu/mpc5xxx/cpu.c
478 +++ b/arch/powerpc/cpu/mpc5xxx/cpu.c
479 @@ -19,7 +19,7 @@
480 #include <asm/processor.h>
481
482 #if defined(CONFIG_OF_LIBFDT)
483 -#include <libfdt.h>
484 +#include <linux/libfdt.h>
485 #include <fdt_support.h>
486 #endif
487
488 diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c
489 index 9f2be3cb22c7..68ce80e6f192 100644
490 --- a/arch/powerpc/cpu/mpc8260/cpu.c
491 +++ b/arch/powerpc/cpu/mpc8260/cpu.c
492 @@ -33,7 +33,7 @@
493 #include <asm/cpm_8260.h>
494
495 #if defined(CONFIG_OF_LIBFDT)
496 -#include <libfdt.h>
497 +#include <linux/libfdt.h>
498 #include <fdt_support.h>
499 #endif
500
501 diff --git a/arch/powerpc/cpu/mpc8260/pci.c b/arch/powerpc/cpu/mpc8260/pci.c
502 index 56f290ca92d6..2700046ce140 100644
503 --- a/arch/powerpc/cpu/mpc8260/pci.c
504 +++ b/arch/powerpc/cpu/mpc8260/pci.c
505 @@ -18,7 +18,7 @@
506 #include <asm/m8260_pci.h>
507 #include <asm/io.h>
508 #ifdef CONFIG_OF_LIBFDT
509 -#include <libfdt.h>
510 +#include <linux/libfdt.h>
511 #include <fdt_support.h>
512 #endif
513
514 diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
515 index c87f0fdd29f5..919289b70a98 100644
516 --- a/arch/powerpc/cpu/mpc83xx/cpu.c
517 +++ b/arch/powerpc/cpu/mpc83xx/cpu.c
518 @@ -15,7 +15,7 @@
519 #include <command.h>
520 #include <mpc83xx.h>
521 #include <asm/processor.h>
522 -#include <libfdt.h>
523 +#include <linux/libfdt.h>
524 #include <tsec.h>
525 #include <netdev.h>
526 #include <fsl_esdhc.h>
527 diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
528 index f249a585edf1..c51eb9a01065 100644
529 --- a/arch/powerpc/cpu/mpc83xx/fdt.c
530 +++ b/arch/powerpc/cpu/mpc83xx/fdt.c
531 @@ -8,7 +8,7 @@
532 */
533
534 #include <common.h>
535 -#include <libfdt.h>
536 +#include <linux/libfdt.h>
537 #include <fdt_support.h>
538 #include <asm/processor.h>
539
540 diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
541 index c7ea94cab561..bf41c69d8803 100644
542 --- a/arch/powerpc/cpu/mpc83xx/pci.c
543 +++ b/arch/powerpc/cpu/mpc83xx/pci.c
544 @@ -11,7 +11,7 @@
545 #include <pci.h>
546
547 #if defined(CONFIG_OF_LIBFDT)
548 -#include <libfdt.h>
549 +#include <linux/libfdt.h>
550 #include <fdt_support.h>
551 #endif
552
553 diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
554 index 67140ba9ee18..4124be5afe87 100644
555 --- a/arch/powerpc/cpu/mpc85xx/fdt.c
556 +++ b/arch/powerpc/cpu/mpc85xx/fdt.c
557 @@ -8,7 +8,7 @@
558 */
559
560 #include <common.h>
561 -#include <libfdt.h>
562 +#include <linux/libfdt.h>
563 #include <fdt_support.h>
564 #include <asm/processor.h>
565 #include <linux/ctype.h>
566 diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
567 index 7a4465fefc5b..6cfe2f67593e 100644
568 --- a/arch/powerpc/cpu/mpc85xx/liodn.c
569 +++ b/arch/powerpc/cpu/mpc85xx/liodn.c
570 @@ -5,7 +5,7 @@
571 */
572
573 #include <common.h>
574 -#include <libfdt.h>
575 +#include <linux/libfdt.h>
576 #include <fdt_support.h>
577
578 #include <asm/immap_85xx.h>
579 diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
580 index 3777c6faa166..abb12837d20e 100644
581 --- a/arch/powerpc/cpu/mpc85xx/portals.c
582 +++ b/arch/powerpc/cpu/mpc85xx/portals.c
583 @@ -5,7 +5,7 @@
584 */
585
586 #include <common.h>
587 -#include <libfdt.h>
588 +#include <linux/libfdt.h>
589 #include <fdt_support.h>
590
591 #include <asm/processor.h>
592 diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
593 index 5f9ad6b0b6d4..0074d3ce6d65 100644
594 --- a/arch/powerpc/cpu/mpc86xx/fdt.c
595 +++ b/arch/powerpc/cpu/mpc86xx/fdt.c
596 @@ -5,7 +5,7 @@
597 */
598
599 #include <common.h>
600 -#include <libfdt.h>
601 +#include <linux/libfdt.h>
602 #include <fdt_support.h>
603 #include <asm/mp.h>
604
605 diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
606 index 105be9ccc7e1..ca3b52396756 100644
607 --- a/arch/powerpc/cpu/mpc8xx/cpu.c
608 +++ b/arch/powerpc/cpu/mpc8xx/cpu.c
609 @@ -28,7 +28,7 @@
610 #include <asm/io.h>
611
612 #if defined(CONFIG_OF_LIBFDT)
613 -#include <libfdt.h>
614 +#include <linux/libfdt.h>
615 #include <fdt_support.h>
616 #endif
617
618 diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c
619 index 97830e3c8bd4..3f612c9aa08f 100644
620 --- a/arch/powerpc/cpu/mpc8xx/fdt.c
621 +++ b/arch/powerpc/cpu/mpc8xx/fdt.c
622 @@ -7,7 +7,7 @@
623 */
624
625 #include <common.h>
626 -#include <libfdt.h>
627 +#include <linux/libfdt.h>
628 #include <fdt_support.h>
629
630 DECLARE_GLOBAL_DATA_PTR;
631 diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
632 index 9cc1676b6029..1f928bd136d2 100644
633 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c
634 +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
635 @@ -8,7 +8,7 @@
636 */
637
638 #include <common.h>
639 -#include <libfdt.h>
640 +#include <linux/libfdt.h>
641 #include <fdt_support.h>
642 #include <asm/mp.h>
643 #include <asm/fsl_serdes.h>
644 diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c
645 index c73509b3ee35..42fa592ca69a 100644
646 --- a/arch/powerpc/cpu/ppc4xx/fdt.c
647 +++ b/arch/powerpc/cpu/ppc4xx/fdt.c
648 @@ -12,7 +12,7 @@
649 #include <asm/ppc4xx.h>
650
651 #ifdef CONFIG_OF_BOARD_SETUP
652 -#include <libfdt.h>
653 +#include <linux/libfdt.h>
654 #include <fdt_support.h>
655 #include <asm/4xx_pcie.h>
656
657 diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
658 index 17c5ed173cb2..a5c257c7a57c 100644
659 --- a/arch/powerpc/lib/bootm.c
660 +++ b/arch/powerpc/lib/bootm.c
661 @@ -20,7 +20,7 @@
662 #include <asm/mp.h>
663
664 #if defined(CONFIG_OF_LIBFDT)
665 -#include <libfdt.h>
666 +#include <linux/libfdt.h>
667 #include <fdt_support.h>
668 #endif
669
670 diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
671 index 2def72212d1f..938ff3d418a1 100644
672 --- a/arch/sandbox/cpu/cpu.c
673 +++ b/arch/sandbox/cpu/cpu.c
674 @@ -5,7 +5,7 @@
675 #define DEBUG
676 #include <common.h>
677 #include <errno.h>
678 -#include <libfdt.h>
679 +#include <linux/libfdt.h>
680 #include <os.h>
681 #include <asm/io.h>
682 #include <asm/state.h>
683 diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
684 index eac5b781e94c..881325875459 100644
685 --- a/arch/x86/cpu/intel_common/microcode.c
686 +++ b/arch/x86/cpu/intel_common/microcode.c
687 @@ -10,7 +10,7 @@
688 #include <common.h>
689 #include <errno.h>
690 #include <fdtdec.h>
691 -#include <libfdt.h>
692 +#include <linux/libfdt.h>
693 #include <asm/cpu.h>
694 #include <asm/microcode.h>
695 #include <asm/msr.h>
696 diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
697 index 0d086e87fa30..837705316481 100644
698 --- a/board/Arcturus/ucp1020/ucp1020.c
699 +++ b/board/Arcturus/ucp1020/ucp1020.c
700 @@ -15,7 +15,7 @@
701 #include <pci.h>
702 #include <i2c.h>
703 #include <miiphy.h>
704 -#include <libfdt.h>
705 +#include <linux/libfdt.h>
706 #include <fdt_support.h>
707 #include <fsl_mdio.h>
708 #include <tsec.h>
709 diff --git a/board/a4m072/a4m072.c b/board/a4m072/a4m072.c
710 index 20d8b80f7efe..31b877f57c23 100644
711 --- a/board/a4m072/a4m072.c
712 +++ b/board/a4m072/a4m072.c
713 @@ -16,7 +16,7 @@
714 #include <pci.h>
715 #include <asm/processor.h>
716 #include <asm/io.h>
717 -#include <libfdt.h>
718 +#include <linux/libfdt.h>
719 #include <netdev.h>
720 #include <led-display.h>
721 #include <linux/err.h>
722 diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
723 index 6ea004c214eb..6e46980329cf 100644
724 --- a/board/amcc/canyonlands/canyonlands.c
725 +++ b/board/amcc/canyonlands/canyonlands.c
726 @@ -7,7 +7,7 @@
727
728 #include <common.h>
729 #include <asm/ppc440.h>
730 -#include <libfdt.h>
731 +#include <linux/libfdt.h>
732 #include <fdt_support.h>
733 #include <i2c.h>
734 #include <asm/processor.h>
735 diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c
736 index 7582d40ad1ac..de8abeca1dc0 100644
737 --- a/board/amcc/katmai/katmai.c
738 +++ b/board/amcc/katmai/katmai.c
739 @@ -8,7 +8,7 @@
740 #include <common.h>
741 #include <asm/ppc4xx.h>
742 #include <i2c.h>
743 -#include <libfdt.h>
744 +#include <linux/libfdt.h>
745 #include <fdt_support.h>
746 #include <netdev.h>
747 #include <asm/processor.h>
748 diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c
749 index 29372178f3ac..c12fa7b9baea 100644
750 --- a/board/amcc/kilauea/kilauea.c
751 +++ b/board/amcc/kilauea/kilauea.c
752 @@ -8,7 +8,7 @@
753 #include <common.h>
754 #include <asm/ppc4xx.h>
755 #include <asm/ppc405.h>
756 -#include <libfdt.h>
757 +#include <linux/libfdt.h>
758 #include <fdt_support.h>
759 #include <asm/processor.h>
760 #include <asm/io.h>
761 diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c
762 index 2194942cd5ab..90ac850f9000 100644
763 --- a/board/amcc/makalu/makalu.c
764 +++ b/board/amcc/makalu/makalu.c
765 @@ -8,7 +8,7 @@
766 #include <common.h>
767 #include <asm/ppc4xx.h>
768 #include <asm/ppc405.h>
769 -#include <libfdt.h>
770 +#include <linux/libfdt.h>
771 #include <asm/processor.h>
772 #include <asm/ppc4xx-gpio.h>
773 #include <asm/io.h>
774 diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c
775 index 91c6cbf7aa80..a95e8559b355 100644
776 --- a/board/amcc/sequoia/sequoia.c
777 +++ b/board/amcc/sequoia/sequoia.c
778 @@ -11,7 +11,7 @@
779
780 #include <common.h>
781 #include <errno.h>
782 -#include <libfdt.h>
783 +#include <linux/libfdt.h>
784 #include <fdt_support.h>
785 #include <asm/ppc4xx.h>
786 #include <asm/ppc4xx-gpio.h>
787 diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c
788 index 56b5191d6667..11cd0c4f40eb 100644
789 --- a/board/amcc/yosemite/yosemite.c
790 +++ b/board/amcc/yosemite/yosemite.c
791 @@ -10,7 +10,7 @@
792 #include <asm/processor.h>
793 #include <asm/io.h>
794 #include <spd_sdram.h>
795 -#include <libfdt.h>
796 +#include <linux/libfdt.h>
797 #include <fdt_support.h>
798
799 DECLARE_GLOBAL_DATA_PTR;
800 diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
801 index c7adf950f579..b143e040974b 100644
802 --- a/board/armltd/vexpress/vexpress_tc2.c
803 +++ b/board/armltd/vexpress/vexpress_tc2.c
804 @@ -11,7 +11,7 @@
805 #include <asm/io.h>
806 #include <asm/u-boot.h>
807 #include <common.h>
808 -#include <libfdt.h>
809 +#include <linux/libfdt.h>
810
811 #define SCC_BASE 0x7fff0000
812
813 diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c
814 index fce998d00fca..e699d22a913f 100644
815 --- a/board/cm5200/cm5200.c
816 +++ b/board/cm5200/cm5200.c
817 @@ -27,7 +27,7 @@
818 #include <linux/ctype.h>
819
820 #ifdef CONFIG_OF_LIBFDT
821 -#include <libfdt.h>
822 +#include <linux/libfdt.h>
823 #include <fdt_support.h>
824 #endif /* CONFIG_OF_LIBFDT */
825
826 diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
827 index a4a602943ed2..e2d25e43861d 100644
828 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
829 +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
830 @@ -764,7 +764,7 @@ int board_late_init(void)
831 #ifdef CONFIG_SPL_BUILD
832 #include <asm/arch/mx6-ddr.h>
833 #include <spl.h>
834 -#include <libfdt.h>
835 +#include <linux/libfdt.h>
836 #include <spi_flash.h>
837 #include <spi.h>
838
839 diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
840 index 5b60654991bf..ddc283297fee 100644
841 --- a/board/el/el6x/el6x.c
842 +++ b/board/el/el6x/el6x.c
843 @@ -480,7 +480,7 @@ int checkboard(void)
844
845 #ifdef CONFIG_SPL_BUILD
846 #include <spl.h>
847 -#include <libfdt.h>
848 +#include <linux/libfdt.h>
849
850 const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = {
851 .dram_sdclk_0 = 0x00020030,
852 diff --git a/board/engicam/geam6ul/geam6ul.c b/board/engicam/geam6ul/geam6ul.c
853 index 40f20a9bec28..2a61976e6010 100644
854 --- a/board/engicam/geam6ul/geam6ul.c
855 +++ b/board/engicam/geam6ul/geam6ul.c
856 @@ -123,7 +123,7 @@ int dram_init(void)
857 }
858
859 #ifdef CONFIG_SPL_BUILD
860 -#include <libfdt.h>
861 +#include <linux/libfdt.h>
862 #include <spl.h>
863
864 #include <asm/arch/crm_regs.h>
865 diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c
866 index 171ec451a15f..f444aa115653 100644
867 --- a/board/engicam/icorem6/icorem6.c
868 +++ b/board/engicam/icorem6/icorem6.c
869 @@ -229,7 +229,7 @@ int dram_init(void)
870 }
871
872 #ifdef CONFIG_SPL_BUILD
873 -#include <libfdt.h>
874 +#include <linux/libfdt.h>
875 #include <spl.h>
876
877 #include <asm/arch/crm_regs.h>
878 diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c
879 index 2769177dd360..1231384be425 100644
880 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c
881 +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c
882 @@ -53,7 +53,7 @@ int dram_init(void)
883 }
884
885 #ifdef CONFIG_SPL_BUILD
886 -#include <libfdt.h>
887 +#include <linux/libfdt.h>
888 #include <spl.h>
889
890 #include <asm/arch/crm_regs.h>
891 diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c
892 index c510ab13acad..a6134a5b0d1f 100644
893 --- a/board/esd/cpci405/cpci405.c
894 +++ b/board/esd/cpci405/cpci405.c
895 @@ -6,7 +6,7 @@
896 */
897 #include <common.h>
898 #include <console.h>
899 -#include <libfdt.h>
900 +#include <linux/libfdt.h>
901 #include <fdt_support.h>
902 #include <asm/processor.h>
903 #include <asm/io.h>
904 diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c
905 index 31ac72861f17..4fb10b0bfa97 100644
906 --- a/board/esd/pmc405de/pmc405de.c
907 +++ b/board/esd/pmc405de/pmc405de.c
908 @@ -7,7 +7,7 @@
909
910 #include <common.h>
911 #include <console.h>
912 -#include <libfdt.h>
913 +#include <linux/libfdt.h>
914 #include <fdt_support.h>
915 #include <asm/processor.h>
916 #include <asm/io.h>
917 diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
918 index 0d43505e358e..92007923a90f 100644
919 --- a/board/esd/pmc440/pmc440.c
920 +++ b/board/esd/pmc440/pmc440.c
921 @@ -14,7 +14,7 @@
922 */
923 #include <common.h>
924 #include <console.h>
925 -#include <libfdt.h>
926 +#include <linux/libfdt.h>
927 #include <fdt_support.h>
928 #include <asm/ppc440.h>
929 #include <asm/processor.h>
930 diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
931 index f8f1834b59c1..089a86112b7b 100644
932 --- a/board/esd/vme8349/vme8349.c
933 +++ b/board/esd/vme8349/vme8349.c
934 @@ -17,7 +17,7 @@
935 #include <mpc83xx.h>
936 #include <asm/mpc8349_pci.h>
937 #if defined(CONFIG_OF_LIBFDT)
938 -#include <libfdt.h>
939 +#include <linux/libfdt.h>
940 #endif
941 #include <asm/io.h>
942 #include <asm/mmu.h>
943 diff --git a/board/freescale/b4860qds/pci.c b/board/freescale/b4860qds/pci.c
944 index d9ccac7a6abc..1216d6329915 100644
945 --- a/board/freescale/b4860qds/pci.c
946 +++ b/board/freescale/b4860qds/pci.c
947 @@ -8,7 +8,7 @@
948 #include <command.h>
949 #include <pci.h>
950 #include <asm/fsl_pci.h>
951 -#include <libfdt.h>
952 +#include <linux/libfdt.h>
953 #include <fdt_support.h>
954 #include <asm/fsl_serdes.h>
955
956 diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c
957 index fb8bb39d87e3..8a94ac37b98e 100644
958 --- a/board/freescale/bsc9131rdb/bsc9131rdb.c
959 +++ b/board/freescale/bsc9131rdb/bsc9131rdb.c
960 @@ -11,7 +11,7 @@
961 #include <asm/immap_85xx.h>
962 #include <asm/io.h>
963 #include <miiphy.h>
964 -#include <libfdt.h>
965 +#include <linux/libfdt.h>
966 #include <fdt_support.h>
967 #include <fsl_mdio.h>
968 #include <tsec.h>
969 diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c
970 index 2c836da63b2d..debdf641b0ac 100644
971 --- a/board/freescale/bsc9132qds/bsc9132qds.c
972 +++ b/board/freescale/bsc9132qds/bsc9132qds.c
973 @@ -11,7 +11,7 @@
974 #include <asm/immap_85xx.h>
975 #include <asm/io.h>
976 #include <miiphy.h>
977 -#include <libfdt.h>
978 +#include <linux/libfdt.h>
979 #include <fdt_support.h>
980 #include <fsl_mdio.h>
981 #include <tsec.h>
982 diff --git a/board/freescale/c29xpcie/c29xpcie.c b/board/freescale/c29xpcie/c29xpcie.c
983 index 45f463f01f38..2ef87d1c007e 100644
984 --- a/board/freescale/c29xpcie/c29xpcie.c
985 +++ b/board/freescale/c29xpcie/c29xpcie.c
986 @@ -11,7 +11,7 @@
987 #include <asm/immap_85xx.h>
988 #include <asm/io.h>
989 #include <miiphy.h>
990 -#include <libfdt.h>
991 +#include <linux/libfdt.h>
992 #include <fdt_support.h>
993 #include <fsl_mdio.h>
994 #include <tsec.h>
995 diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
996 index 571dfbbaada6..90bd7bc9e2e6 100644
997 --- a/board/freescale/common/cds_pci_ft.c
998 +++ b/board/freescale/common/cds_pci_ft.c
999 @@ -5,7 +5,7 @@
1000 */
1001
1002 #include <common.h>
1003 -#include <libfdt.h>
1004 +#include <linux/libfdt.h>
1005 #include <fdt_support.h>
1006 #include "cadmus.h"
1007
1008 diff --git a/board/freescale/common/fman.c b/board/freescale/common/fman.c
1009 index b5025ab14e84..e6952b5e55bf 100644
1010 --- a/board/freescale/common/fman.c
1011 +++ b/board/freescale/common/fman.c
1012 @@ -5,8 +5,8 @@
1013 */
1014
1015 #include <common.h>
1016 -#include <libfdt.h>
1017 -#include <libfdt_env.h>
1018 +#include <linux/libfdt.h>
1019 +#include <linux/libfdt_env.h>
1020 #include <fdt_support.h>
1021
1022 #include <fm_eth.h>
1023 diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c
1024 index 9f4f808376be..ccea8b17cfe0 100644
1025 --- a/board/freescale/common/p_corenet/pci.c
1026 +++ b/board/freescale/common/p_corenet/pci.c
1027 @@ -8,7 +8,7 @@
1028 #include <command.h>
1029 #include <pci.h>
1030 #include <asm/fsl_pci.h>
1031 -#include <libfdt.h>
1032 +#include <linux/libfdt.h>
1033 #include <fdt_support.h>
1034 #include <asm/fsl_serdes.h>
1035
1036 diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c
1037 index 5c3c59375cbe..f3e0fb2cd5e4 100644
1038 --- a/board/freescale/common/sgmii_riser.c
1039 +++ b/board/freescale/common/sgmii_riser.c
1040 @@ -15,7 +15,7 @@
1041 #include <config.h>
1042 #include <common.h>
1043 #include <net.h>
1044 -#include <libfdt.h>
1045 +#include <linux/libfdt.h>
1046 #include <tsec.h>
1047 #include <fdt_support.h>
1048
1049 diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
1050 index bf263761f1db..e2767d43361a 100644
1051 --- a/board/freescale/ls1043aqds/eth.c
1052 +++ b/board/freescale/ls1043aqds/eth.c
1053 @@ -11,7 +11,7 @@
1054 #include <fm_eth.h>
1055 #include <fsl_mdio.h>
1056 #include <fsl_dtsec.h>
1057 -#include <libfdt.h>
1058 +#include <linux/libfdt.h>
1059 #include <malloc.h>
1060 #include <asm/arch/fsl_serdes.h>
1061
1062 diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
1063 index 4f9b9c8a7739..93a07261c83d 100644
1064 --- a/board/freescale/ls2080a/ls2080a.c
1065 +++ b/board/freescale/ls2080a/ls2080a.c
1066 @@ -11,7 +11,7 @@
1067 #include <fsl_ddr.h>
1068 #include <asm/io.h>
1069 #include <fdt_support.h>
1070 -#include <libfdt.h>
1071 +#include <linux/libfdt.h>
1072 #include <fsl-mc/fsl_mc.h>
1073 #include <environment.h>
1074 #include <asm/arch/soc.h>
1075 diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
1076 index 73a61fd75aa1..155025118d36 100644
1077 --- a/board/freescale/ls2080aqds/ls2080aqds.c
1078 +++ b/board/freescale/ls2080aqds/ls2080aqds.c
1079 @@ -11,7 +11,7 @@
1080 #include <fsl_ddr.h>
1081 #include <asm/io.h>
1082 #include <fdt_support.h>
1083 -#include <libfdt.h>
1084 +#include <linux/libfdt.h>
1085 #include <fsl-mc/fsl_mc.h>
1086 #include <environment.h>
1087 #include <i2c.h>
1088 diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
1089 index 02954ef6d760..3e89b805f614 100644
1090 --- a/board/freescale/ls2080ardb/ls2080ardb.c
1091 +++ b/board/freescale/ls2080ardb/ls2080ardb.c
1092 @@ -12,7 +12,7 @@
1093 #include <asm/io.h>
1094 #include <hwconfig.h>
1095 #include <fdt_support.h>
1096 -#include <libfdt.h>
1097 +#include <linux/libfdt.h>
1098 #include <fsl-mc/fsl_mc.h>
1099 #include <environment.h>
1100 #include <efi_loader.h>
1101 diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
1102 index b4a0dd5d1a8f..93c7200509c2 100644
1103 --- a/board/freescale/mpc8308rdb/mpc8308rdb.c
1104 +++ b/board/freescale/mpc8308rdb/mpc8308rdb.c
1105 @@ -9,7 +9,7 @@
1106 #include <hwconfig.h>
1107 #include <i2c.h>
1108 #include <spi.h>
1109 -#include <libfdt.h>
1110 +#include <linux/libfdt.h>
1111 #include <fdt_support.h>
1112 #include <pci.h>
1113 #include <mpc83xx.h>
1114 diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
1115 index eac193e81776..ca8bd7c49fb0 100644
1116 --- a/board/freescale/mpc8313erdb/mpc8313erdb.c
1117 +++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
1118 @@ -8,7 +8,7 @@
1119
1120 #include <common.h>
1121 #if defined(CONFIG_OF_LIBFDT)
1122 -#include <libfdt.h>
1123 +#include <linux/libfdt.h>
1124 #endif
1125 #include <pci.h>
1126 #include <mpc83xx.h>
1127 diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
1128 index 3cec09b58686..6101260278ae 100644
1129 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c
1130 +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
1131 @@ -10,7 +10,7 @@
1132 #include <common.h>
1133 #include <hwconfig.h>
1134 #include <i2c.h>
1135 -#include <libfdt.h>
1136 +#include <linux/libfdt.h>
1137 #include <fdt_support.h>
1138 #include <pci.h>
1139 #include <mpc83xx.h>
1140 diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
1141 index 0a0152ad9ea3..13cf2411b65d 100644
1142 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c
1143 +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
1144 @@ -15,7 +15,7 @@
1145 #include <i2c.h>
1146 #include <miiphy.h>
1147 #include <command.h>
1148 -#include <libfdt.h>
1149 +#include <linux/libfdt.h>
1150 #if defined(CONFIG_PCI)
1151 #include <pci.h>
1152 #endif
1153 diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
1154 index adf425486e1e..9da9a1ef7b5c 100644
1155 --- a/board/freescale/mpc832xemds/mpc832xemds.c
1156 +++ b/board/freescale/mpc832xemds/mpc832xemds.c
1157 @@ -17,7 +17,7 @@
1158 #endif
1159 #include <asm/mmu.h>
1160 #if defined(CONFIG_OF_LIBFDT)
1161 -#include <libfdt.h>
1162 +#include <linux/libfdt.h>
1163 #endif
1164 #if defined(CONFIG_PQ_MDS_PIB)
1165 #include "../common/pq-mds-pib.h"
1166 diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
1167 index 02b5040ef4af..af1c3e72fcb4 100644
1168 --- a/board/freescale/mpc8349emds/mpc8349emds.c
1169 +++ b/board/freescale/mpc8349emds/mpc8349emds.c
1170 @@ -19,7 +19,7 @@
1171 #endif
1172
1173 #if defined(CONFIG_OF_LIBFDT)
1174 -#include <libfdt.h>
1175 +#include <linux/libfdt.h>
1176 #endif
1177
1178 int fixed_sdram(void);
1179 diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
1180 index 22a1d99c8846..fd2ce7218e59 100644
1181 --- a/board/freescale/mpc8349itx/mpc8349itx.c
1182 +++ b/board/freescale/mpc8349itx/mpc8349itx.c
1183 @@ -17,7 +17,7 @@
1184 #include <spd_sdram.h>
1185 #include <asm/mmu.h>
1186 #if defined(CONFIG_OF_LIBFDT)
1187 -#include <libfdt.h>
1188 +#include <linux/libfdt.h>
1189 #endif
1190
1191 #ifndef CONFIG_SPD_EEPROM
1192 diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
1193 index 045841d57ba1..6dd139e8621f 100644
1194 --- a/board/freescale/mpc837xemds/mpc837xemds.c
1195 +++ b/board/freescale/mpc837xemds/mpc837xemds.c
1196 @@ -12,7 +12,7 @@
1197 #include <asm/fsl_mpc83xx_serdes.h>
1198 #include <spd_sdram.h>
1199 #include <tsec.h>
1200 -#include <libfdt.h>
1201 +#include <linux/libfdt.h>
1202 #include <fdt_support.h>
1203 #include <fsl_esdhc.h>
1204 #include <fsl_mdio.h>
1205 diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c
1206 index cede1da634e7..51cb63760604 100644
1207 --- a/board/freescale/mpc8536ds/mpc8536ds.c
1208 +++ b/board/freescale/mpc8536ds/mpc8536ds.c
1209 @@ -17,7 +17,7 @@
1210 #include <asm/fsl_serdes.h>
1211 #include <spd.h>
1212 #include <miiphy.h>
1213 -#include <libfdt.h>
1214 +#include <linux/libfdt.h>
1215 #include <spd_sdram.h>
1216 #include <fdt_support.h>
1217 #include <fsl_mdio.h>
1218 diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c
1219 index 1069e2c8c86b..2ad79e2d605f 100644
1220 --- a/board/freescale/mpc8540ads/mpc8540ads.c
1221 +++ b/board/freescale/mpc8540ads/mpc8540ads.c
1222 @@ -15,7 +15,7 @@
1223 #include <asm/mmu.h>
1224 #include <asm/immap_85xx.h>
1225 #include <fsl_ddr_sdram.h>
1226 -#include <libfdt.h>
1227 +#include <linux/libfdt.h>
1228 #include <fdt_support.h>
1229
1230 #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
1231 diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
1232 index 7b264dddd157..33ced17a64b4 100644
1233 --- a/board/freescale/mpc8541cds/mpc8541cds.c
1234 +++ b/board/freescale/mpc8541cds/mpc8541cds.c
1235 @@ -14,7 +14,7 @@
1236 #include <fsl_ddr_sdram.h>
1237 #include <ioports.h>
1238 #include <spd_sdram.h>
1239 -#include <libfdt.h>
1240 +#include <linux/libfdt.h>
1241 #include <fdt_support.h>
1242
1243 #include "../common/cadmus.h"
1244 diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
1245 index 66fb228a9089..a283365ba7c6 100644
1246 --- a/board/freescale/mpc8544ds/mpc8544ds.c
1247 +++ b/board/freescale/mpc8544ds/mpc8544ds.c
1248 @@ -15,7 +15,7 @@
1249 #include <asm/fsl_serdes.h>
1250 #include <asm/io.h>
1251 #include <miiphy.h>
1252 -#include <libfdt.h>
1253 +#include <linux/libfdt.h>
1254 #include <fdt_support.h>
1255 #include <fsl_mdio.h>
1256 #include <tsec.h>
1257 diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
1258 index de76d36174a0..7574b1d4a015 100644
1259 --- a/board/freescale/mpc8548cds/mpc8548cds.c
1260 +++ b/board/freescale/mpc8548cds/mpc8548cds.c
1261 @@ -15,7 +15,7 @@
1262 #include <fsl_ddr_sdram.h>
1263 #include <asm/fsl_serdes.h>
1264 #include <miiphy.h>
1265 -#include <libfdt.h>
1266 +#include <linux/libfdt.h>
1267 #include <fdt_support.h>
1268 #include <tsec.h>
1269 #include <fsl_mdio.h>
1270 diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
1271 index de5f5669e62f..9c74bfdd1d7e 100644
1272 --- a/board/freescale/mpc8555cds/mpc8555cds.c
1273 +++ b/board/freescale/mpc8555cds/mpc8555cds.c
1274 @@ -12,7 +12,7 @@
1275 #include <fsl_ddr_sdram.h>
1276 #include <ioports.h>
1277 #include <spd_sdram.h>
1278 -#include <libfdt.h>
1279 +#include <linux/libfdt.h>
1280 #include <fdt_support.h>
1281
1282 #include "../common/cadmus.h"
1283 diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c
1284 index f99d639b2fbf..a603c2f67f26 100644
1285 --- a/board/freescale/mpc8560ads/mpc8560ads.c
1286 +++ b/board/freescale/mpc8560ads/mpc8560ads.c
1287 @@ -18,7 +18,7 @@
1288 #include <ioports.h>
1289 #include <spd_sdram.h>
1290 #include <miiphy.h>
1291 -#include <libfdt.h>
1292 +#include <linux/libfdt.h>
1293 #include <fdt_support.h>
1294 #include <asm/fsl_lbc.h>
1295
1296 diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
1297 index a5c5d9dd1aca..4ad427089955 100644
1298 --- a/board/freescale/mpc8568mds/mpc8568mds.c
1299 +++ b/board/freescale/mpc8568mds/mpc8568mds.c
1300 @@ -17,7 +17,7 @@
1301 #include <spd_sdram.h>
1302 #include <i2c.h>
1303 #include <ioports.h>
1304 -#include <libfdt.h>
1305 +#include <linux/libfdt.h>
1306 #include <fdt_support.h>
1307
1308 #include "bcsr.h"
1309 diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
1310 index 122490c026ed..8e72864becfc 100644
1311 --- a/board/freescale/mpc8569mds/mpc8569mds.c
1312 +++ b/board/freescale/mpc8569mds/mpc8569mds.c
1313 @@ -21,7 +21,7 @@
1314 #include <spd_sdram.h>
1315 #include <i2c.h>
1316 #include <ioports.h>
1317 -#include <libfdt.h>
1318 +#include <linux/libfdt.h>
1319 #include <fdt_support.h>
1320 #include <fsl_esdhc.h>
1321 #include <phy.h>
1322 diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
1323 index ed6836a93027..5ce43a126c0b 100644
1324 --- a/board/freescale/mpc8572ds/mpc8572ds.c
1325 +++ b/board/freescale/mpc8572ds/mpc8572ds.c
1326 @@ -16,7 +16,7 @@
1327 #include <asm/io.h>
1328 #include <asm/fsl_serdes.h>
1329 #include <miiphy.h>
1330 -#include <libfdt.h>
1331 +#include <linux/libfdt.h>
1332 #include <fdt_support.h>
1333 #include <tsec.h>
1334 #include <fsl_mdio.h>
1335 diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
1336 index 95e398c9f495..ea3fe163d67d 100644
1337 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
1338 +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
1339 @@ -14,7 +14,7 @@
1340 #include <asm/fsl_serdes.h>
1341 #include <i2c.h>
1342 #include <asm/io.h>
1343 -#include <libfdt.h>
1344 +#include <linux/libfdt.h>
1345 #include <fdt_support.h>
1346 #include <spd_sdram.h>
1347 #include <netdev.h>
1348 diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
1349 index 94633b5c99dc..1d3fe29b2767 100644
1350 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
1351 +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
1352 @@ -12,7 +12,7 @@
1353 #include <fsl_ddr_sdram.h>
1354 #include <asm/fsl_serdes.h>
1355 #include <asm/io.h>
1356 -#include <libfdt.h>
1357 +#include <linux/libfdt.h>
1358 #include <fdt_support.h>
1359 #include <netdev.h>
1360
1361 diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
1362 index 80a77892c9a1..772a11a94321 100644
1363 --- a/board/freescale/mx6sabresd/mx6sabresd.c
1364 +++ b/board/freescale/mx6sabresd/mx6sabresd.c
1365 @@ -715,7 +715,7 @@ int checkboard(void)
1366
1367 #ifdef CONFIG_SPL_BUILD
1368 #include <spl.h>
1369 -#include <libfdt.h>
1370 +#include <linux/libfdt.h>
1371
1372 #ifdef CONFIG_SPL_OS_BOOT
1373 int spl_start_uboot(void)
1374 diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
1375 index 96c0e8cfc71c..150c0b534dd0 100644
1376 --- a/board/freescale/mx6slevk/mx6slevk.c
1377 +++ b/board/freescale/mx6slevk/mx6slevk.c
1378 @@ -409,7 +409,7 @@ int checkboard(void)
1379
1380 #ifdef CONFIG_SPL_BUILD
1381 #include <spl.h>
1382 -#include <libfdt.h>
1383 +#include <linux/libfdt.h>
1384
1385 const struct mx6sl_iomux_ddr_regs mx6_ddr_ioregs = {
1386 .dram_sdqs0 = 0x00003030,
1387 diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
1388 index 0460cd9257b1..9bc65f3076f2 100644
1389 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
1390 +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
1391 @@ -548,7 +548,7 @@ int checkboard(void)
1392 }
1393
1394 #ifdef CONFIG_SPL_BUILD
1395 -#include <libfdt.h>
1396 +#include <linux/libfdt.h>
1397 #include <spl.h>
1398 #include <asm/arch/mx6-ddr.h>
1399
1400 diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
1401 index b28ce1049589..7e0faa8b1bf7 100644
1402 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
1403 +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
1404 @@ -694,7 +694,7 @@ int checkboard(void)
1405 }
1406
1407 #ifdef CONFIG_SPL_BUILD
1408 -#include <libfdt.h>
1409 +#include <linux/libfdt.h>
1410 #include <spl.h>
1411 #include <asm/arch/mx6-ddr.h>
1412
1413 diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
1414 index 65bb575a9643..377654f9b438 100644
1415 --- a/board/freescale/p1010rdb/p1010rdb.c
1416 +++ b/board/freescale/p1010rdb/p1010rdb.c
1417 @@ -11,7 +11,7 @@
1418 #include <asm/immap_85xx.h>
1419 #include <asm/io.h>
1420 #include <miiphy.h>
1421 -#include <libfdt.h>
1422 +#include <linux/libfdt.h>
1423 #include <fdt_support.h>
1424 #include <fsl_mdio.h>
1425 #include <tsec.h>
1426 diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c
1427 index 345feac0b294..6b280600aae9 100644
1428 --- a/board/freescale/p1022ds/p1022ds.c
1429 +++ b/board/freescale/p1022ds/p1022ds.c
1430 @@ -17,7 +17,7 @@
1431 #include <fsl_ddr_sdram.h>
1432 #include <asm/fsl_serdes.h>
1433 #include <asm/io.h>
1434 -#include <libfdt.h>
1435 +#include <linux/libfdt.h>
1436 #include <fdt_support.h>
1437 #include <fsl_mdio.h>
1438 #include <tsec.h>
1439 diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
1440 index 04517226033d..17aad34f34df 100644
1441 --- a/board/freescale/p1023rdb/p1023rdb.c
1442 +++ b/board/freescale/p1023rdb/p1023rdb.c
1443 @@ -18,7 +18,7 @@
1444 #include <asm/fsl_pci.h>
1445 #include <fsl_ddr_sdram.h>
1446 #include <asm/fsl_portals.h>
1447 -#include <libfdt.h>
1448 +#include <linux/libfdt.h>
1449 #include <fdt_support.h>
1450 #include <netdev.h>
1451 #include <malloc.h>
1452 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
1453 index 51217c58e578..f3309a226355 100644
1454 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
1455 +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
1456 @@ -20,7 +20,7 @@
1457 #include <asm/fsl_lbc.h>
1458 #include <asm/mp.h>
1459 #include <miiphy.h>
1460 -#include <libfdt.h>
1461 +#include <linux/libfdt.h>
1462 #include <fdt_support.h>
1463 #include <fsl_mdio.h>
1464 #include <tsec.h>
1465 diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c
1466 index f54a6ff8dc72..d1e5e8190b0f 100644
1467 --- a/board/freescale/p1_twr/p1_twr.c
1468 +++ b/board/freescale/p1_twr/p1_twr.c
1469 @@ -20,7 +20,7 @@
1470 #include <asm/fsl_lbc.h>
1471 #include <asm/mp.h>
1472 #include <miiphy.h>
1473 -#include <libfdt.h>
1474 +#include <linux/libfdt.h>
1475 #include <fdt_support.h>
1476 #include <fsl_mdio.h>
1477 #include <tsec.h>
1478 diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
1479 index 6cb5692eda6e..5d6e640e55bb 100644
1480 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c
1481 +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
1482 @@ -11,7 +11,7 @@
1483 #include <asm/mmu.h>
1484 #include <asm/fsl_pci.h>
1485 #include <asm/io.h>
1486 -#include <libfdt.h>
1487 +#include <linux/libfdt.h>
1488 #include <fdt_support.h>
1489 #include <netdev.h>
1490 #include <fdtdec.h>
1491 diff --git a/board/freescale/t102xqds/pci.c b/board/freescale/t102xqds/pci.c
1492 index 736928961852..5ece77993d21 100644
1493 --- a/board/freescale/t102xqds/pci.c
1494 +++ b/board/freescale/t102xqds/pci.c
1495 @@ -8,7 +8,7 @@
1496 #include <command.h>
1497 #include <pci.h>
1498 #include <asm/fsl_pci.h>
1499 -#include <libfdt.h>
1500 +#include <linux/libfdt.h>
1501 #include <fdt_support.h>
1502 #include <asm/fsl_serdes.h>
1503
1504 diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c
1505 index ba7041af9570..f13d41c77d92 100644
1506 --- a/board/freescale/t102xrdb/pci.c
1507 +++ b/board/freescale/t102xrdb/pci.c
1508 @@ -8,7 +8,7 @@
1509 #include <command.h>
1510 #include <pci.h>
1511 #include <asm/fsl_pci.h>
1512 -#include <libfdt.h>
1513 +#include <linux/libfdt.h>
1514 #include <fdt_support.h>
1515 #include <asm/fsl_serdes.h>
1516
1517 diff --git a/board/freescale/t1040qds/pci.c b/board/freescale/t1040qds/pci.c
1518 index c53e3b76a458..68ee74b785c0 100644
1519 --- a/board/freescale/t1040qds/pci.c
1520 +++ b/board/freescale/t1040qds/pci.c
1521 @@ -8,7 +8,7 @@
1522 #include <command.h>
1523 #include <pci.h>
1524 #include <asm/fsl_pci.h>
1525 -#include <libfdt.h>
1526 +#include <linux/libfdt.h>
1527 #include <fdt_support.h>
1528 #include <asm/fsl_serdes.h>
1529
1530 diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c
1531 index c53e3b76a458..68ee74b785c0 100644
1532 --- a/board/freescale/t104xrdb/pci.c
1533 +++ b/board/freescale/t104xrdb/pci.c
1534 @@ -8,7 +8,7 @@
1535 #include <command.h>
1536 #include <pci.h>
1537 #include <asm/fsl_pci.h>
1538 -#include <libfdt.h>
1539 +#include <linux/libfdt.h>
1540 #include <fdt_support.h>
1541 #include <asm/fsl_serdes.h>
1542
1543 diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c
1544 index 84a89dad4f29..5a6731c12bcf 100644
1545 --- a/board/freescale/t208xqds/pci.c
1546 +++ b/board/freescale/t208xqds/pci.c
1547 @@ -8,7 +8,7 @@
1548 #include <command.h>
1549 #include <pci.h>
1550 #include <asm/fsl_pci.h>
1551 -#include <libfdt.h>
1552 +#include <linux/libfdt.h>
1553 #include <fdt_support.h>
1554 #include <asm/fsl_serdes.h>
1555
1556 diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c
1557 index ba7041af9570..f13d41c77d92 100644
1558 --- a/board/freescale/t208xrdb/pci.c
1559 +++ b/board/freescale/t208xrdb/pci.c
1560 @@ -8,7 +8,7 @@
1561 #include <command.h>
1562 #include <pci.h>
1563 #include <asm/fsl_pci.h>
1564 -#include <libfdt.h>
1565 +#include <linux/libfdt.h>
1566 #include <fdt_support.h>
1567 #include <asm/fsl_serdes.h>
1568
1569 diff --git a/board/freescale/t4qds/pci.c b/board/freescale/t4qds/pci.c
1570 index 08d74b444ad2..398c62bc48fd 100644
1571 --- a/board/freescale/t4qds/pci.c
1572 +++ b/board/freescale/t4qds/pci.c
1573 @@ -8,7 +8,7 @@
1574 #include <command.h>
1575 #include <pci.h>
1576 #include <asm/fsl_pci.h>
1577 -#include <libfdt.h>
1578 +#include <linux/libfdt.h>
1579 #include <fdt_support.h>
1580 #include <asm/fsl_serdes.h>
1581
1582 diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c
1583 index 6387a20caece..36cff0dac4cf 100644
1584 --- a/board/freescale/t4rdb/pci.c
1585 +++ b/board/freescale/t4rdb/pci.c
1586 @@ -8,7 +8,7 @@
1587 #include <command.h>
1588 #include <pci.h>
1589 #include <asm/fsl_pci.h>
1590 -#include <libfdt.h>
1591 +#include <linux/libfdt.h>
1592 #include <fdt_support.h>
1593 #include <asm/fsl_serdes.h>
1594
1595 diff --git a/board/gdsys/405ex/io64.c b/board/gdsys/405ex/io64.c
1596 index 0a7baaa9dbce..be8fc3c6b99d 100644
1597 --- a/board/gdsys/405ex/io64.c
1598 +++ b/board/gdsys/405ex/io64.c
1599 @@ -11,7 +11,7 @@
1600 #include <common.h>
1601 #include <asm/ppc4xx.h>
1602 #include <asm/ppc405.h>
1603 -#include <libfdt.h>
1604 +#include <linux/libfdt.h>
1605 #include <fdt_support.h>
1606 #include <asm/processor.h>
1607 #include <asm/io.h>
1608 diff --git a/board/gdsys/intip/intip.c b/board/gdsys/intip/intip.c
1609 index 2d7d789b23b3..f65eceae013b 100644
1610 --- a/board/gdsys/intip/intip.c
1611 +++ b/board/gdsys/intip/intip.c
1612 @@ -11,7 +11,7 @@
1613
1614 #include <common.h>
1615 #include <asm/ppc440.h>
1616 -#include <libfdt.h>
1617 +#include <linux/libfdt.h>
1618 #include <fdt_support.h>
1619 #include <i2c.h>
1620 #include <asm/processor.h>
1621 diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
1622 index c6566e9196ca..741bc47cb108 100644
1623 --- a/board/gdsys/mpc8308/hrcon.c
1624 +++ b/board/gdsys/mpc8308/hrcon.c
1625 @@ -9,7 +9,7 @@
1626 #include <hwconfig.h>
1627 #include <i2c.h>
1628 #include <spi.h>
1629 -#include <libfdt.h>
1630 +#include <linux/libfdt.h>
1631 #include <fdt_support.h>
1632 #include <pci.h>
1633 #include <mpc83xx.h>
1634 diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
1635 index 34e9d1956e2e..21a64f2ad5f2 100644
1636 --- a/board/gdsys/mpc8308/strider.c
1637 +++ b/board/gdsys/mpc8308/strider.c
1638 @@ -9,7 +9,7 @@
1639 #include <hwconfig.h>
1640 #include <i2c.h>
1641 #include <spi.h>
1642 -#include <libfdt.h>
1643 +#include <linux/libfdt.h>
1644 #include <fdt_support.h>
1645 #include <pci.h>
1646 #include <mpc83xx.h>
1647 diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
1648 index 01064dcfde10..8035284a3359 100644
1649 --- a/board/gdsys/p1022/controlcenterd.c
1650 +++ b/board/gdsys/p1022/controlcenterd.c
1651 @@ -32,7 +32,7 @@
1652 #include <fsl_ddr_sdram.h>
1653 #include <asm/fsl_serdes.h>
1654 #include <asm/io.h>
1655 -#include <libfdt.h>
1656 +#include <linux/libfdt.h>
1657 #include <fdt_support.h>
1658 #include <fsl_mdio.h>
1659 #include <tsec.h>
1660 diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
1661 index e7838dcd2a6e..50016c26940d 100644
1662 --- a/board/ids/ids8313/ids8313.c
1663 +++ b/board/ids/ids8313/ids8313.c
1664 @@ -15,7 +15,7 @@
1665 #include <common.h>
1666 #include <mpc83xx.h>
1667 #include <spi.h>
1668 -#include <libfdt.h>
1669 +#include <linux/libfdt.h>
1670
1671 DECLARE_GLOBAL_DATA_PTR;
1672 /** CPLD contains the info about:
1673 diff --git a/board/ifm/o2dnt2/o2dnt2.c b/board/ifm/o2dnt2/o2dnt2.c
1674 index 4fc6809ad612..d21860fe6d42 100644
1675 --- a/board/ifm/o2dnt2/o2dnt2.c
1676 +++ b/board/ifm/o2dnt2/o2dnt2.c
1677 @@ -13,7 +13,7 @@
1678 #include <mpc5xxx.h>
1679 #include <asm/processor.h>
1680 #include <asm/io.h>
1681 -#include <libfdt.h>
1682 +#include <linux/libfdt.h>
1683 #include <fdt_support.h>
1684 #include <i2c.h>
1685 #include <miiphy.h>
1686 diff --git a/board/intercontrol/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c
1687 index 05d673dc89b3..72aae3d88c50 100644
1688 --- a/board/intercontrol/digsy_mtc/digsy_mtc.c
1689 +++ b/board/intercontrol/digsy_mtc/digsy_mtc.c
1690 @@ -30,7 +30,7 @@
1691 #else
1692 #include "is42s16800a-7t.h"
1693 #endif
1694 -#include <libfdt.h>
1695 +#include <linux/libfdt.h>
1696 #include <fdt_support.h>
1697 #include <i2c.h>
1698 #include <mb862xx.h>
1699 diff --git a/board/ipek01/ipek01.c b/board/ipek01/ipek01.c
1700 index 2e62355c4838..67a15395110b 100644
1701 --- a/board/ipek01/ipek01.c
1702 +++ b/board/ipek01/ipek01.c
1703 @@ -19,7 +19,7 @@
1704 #include <pci.h>
1705 #include <netdev.h>
1706 #include <miiphy.h>
1707 -#include <libfdt.h>
1708 +#include <linux/libfdt.h>
1709 #include <mb862xx.h>
1710 #include <video_fb.h>
1711 #include <asm/processor.h>
1712 diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c
1713 index d56902bcd23c..5639f94e2164 100644
1714 --- a/board/jupiter/jupiter.c
1715 +++ b/board/jupiter/jupiter.c
1716 @@ -12,7 +12,7 @@
1717 #include <mpc5xxx.h>
1718 #include <pci.h>
1719 #include <asm/processor.h>
1720 -#include <libfdt.h>
1721 +#include <linux/libfdt.h>
1722
1723 #define SDRAM_DDR 0
1724 #if 1
1725 diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c
1726 index c2a7a5f99577..63712a8a9dc4 100644
1727 --- a/board/keymile/km82xx/km82xx.c
1728 +++ b/board/keymile/km82xx/km82xx.c
1729 @@ -11,7 +11,7 @@
1730 #include <malloc.h>
1731 #include <asm/io.h>
1732
1733 -#include <libfdt.h>
1734 +#include <linux/libfdt.h>
1735 #include <i2c.h>
1736 #include "../common/common.h"
1737
1738 diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
1739 index 154f97457b4d..a4d432de67e1 100644
1740 --- a/board/keymile/km83xx/km83xx.c
1741 +++ b/board/keymile/km83xx/km83xx.c
1742 @@ -23,7 +23,7 @@
1743 #include <asm/mmu.h>
1744 #include <asm/processor.h>
1745 #include <pci.h>
1746 -#include <libfdt.h>
1747 +#include <linux/libfdt.h>
1748 #include <post.h>
1749
1750 #include "../common/common.h"
1751 diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
1752 index b827e43a7a04..b2c3679719b3 100644
1753 --- a/board/keymile/kmp204x/pci.c
1754 +++ b/board/keymile/kmp204x/pci.c
1755 @@ -11,7 +11,7 @@
1756 #include <command.h>
1757 #include <pci.h>
1758 #include <asm/fsl_pci.h>
1759 -#include <libfdt.h>
1760 +#include <linux/libfdt.h>
1761 #include <fdt_support.h>
1762 #include <asm/fsl_serdes.h>
1763 #include <linux/errno.h>
1764 diff --git a/board/mosaixtech/icon/icon.c b/board/mosaixtech/icon/icon.c
1765 index 7558234abf1a..fdc7d8f189eb 100644
1766 --- a/board/mosaixtech/icon/icon.c
1767 +++ b/board/mosaixtech/icon/icon.c
1768 @@ -8,7 +8,7 @@
1769 #include <common.h>
1770 #include <asm/ppc4xx.h>
1771 #include <i2c.h>
1772 -#include <libfdt.h>
1773 +#include <linux/libfdt.h>
1774 #include <fdt_support.h>
1775 #include <netdev.h>
1776 #include <video.h>
1777 diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c
1778 index dc237c1cedaf..6440aef929d3 100644
1779 --- a/board/motionpro/motionpro.c
1780 +++ b/board/motionpro/motionpro.c
1781 @@ -13,7 +13,7 @@
1782 #include <common.h>
1783 #include <mpc5xxx.h>
1784 #include <miiphy.h>
1785 -#include <libfdt.h>
1786 +#include <linux/libfdt.h>
1787
1788 #if defined(CONFIG_STATUS_LED)
1789 #include <status_led.h>
1790 diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c
1791 index 234a38780184..e96645f82dc5 100644
1792 --- a/board/mpc8308_p1m/mpc8308_p1m.c
1793 +++ b/board/mpc8308_p1m/mpc8308_p1m.c
1794 @@ -7,7 +7,7 @@
1795
1796 #include <common.h>
1797 #include <i2c.h>
1798 -#include <libfdt.h>
1799 +#include <linux/libfdt.h>
1800 #include <fdt_support.h>
1801 #include <pci.h>
1802 #include <mpc83xx.h>
1803 diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
1804 index c3607daf4605..c1718d7ae033 100644
1805 --- a/board/phytec/pcm058/pcm058.c
1806 +++ b/board/phytec/pcm058/pcm058.c
1807 @@ -400,7 +400,7 @@ int board_late_init(void)
1808
1809 #ifdef CONFIG_SPL_BUILD
1810 #include <spl.h>
1811 -#include <libfdt.h>
1812 +#include <linux/libfdt.h>
1813
1814 static const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = {
1815 .dram_sdclk_0 = 0x00000030,
1816 diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
1817 index 72786d2ace65..227b5a18743e 100644
1818 --- a/board/sbc8349/sbc8349.c
1819 +++ b/board/sbc8349/sbc8349.c
1820 @@ -16,7 +16,7 @@
1821 #include <spd_sdram.h>
1822 #include <miiphy.h>
1823 #if defined(CONFIG_OF_LIBFDT)
1824 -#include <libfdt.h>
1825 +#include <linux/libfdt.h>
1826 #endif
1827
1828 int fixed_sdram(void);
1829 diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
1830 index 25329e44736e..1a48a6c89f24 100644
1831 --- a/board/sbc8548/sbc8548.c
1832 +++ b/board/sbc8548/sbc8548.c
1833 @@ -21,7 +21,7 @@
1834 #include <netdev.h>
1835 #include <tsec.h>
1836 #include <miiphy.h>
1837 -#include <libfdt.h>
1838 +#include <linux/libfdt.h>
1839 #include <fdt_support.h>
1840
1841 DECLARE_GLOBAL_DATA_PTR;
1842 diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
1843 index 6bdf1a28e97b..e7310afdc841 100644
1844 --- a/board/sbc8641d/sbc8641d.c
1845 +++ b/board/sbc8641d/sbc8641d.c
1846 @@ -20,7 +20,7 @@
1847 #include <asm/fsl_pci.h>
1848 #include <fsl_ddr_sdram.h>
1849 #include <asm/fsl_serdes.h>
1850 -#include <libfdt.h>
1851 +#include <linux/libfdt.h>
1852 #include <fdt_support.h>
1853
1854 long int fixed_sdram (void);
1855 diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
1856 index 8b34a80e8f72..11f21393792e 100644
1857 --- a/board/socrates/socrates.c
1858 +++ b/board/socrates/socrates.c
1859 @@ -17,7 +17,7 @@
1860 #include <asm/immap_85xx.h>
1861 #include <ioports.h>
1862 #include <flash.h>
1863 -#include <libfdt.h>
1864 +#include <linux/libfdt.h>
1865 #include <fdt_support.h>
1866 #include <asm/io.h>
1867 #include <i2c.h>
1868 diff --git a/board/sunxi/board.c b/board/sunxi/board.c
1869 index 53656383d512..4d39190f8c79 100644
1870 --- a/board/sunxi/board.c
1871 +++ b/board/sunxi/board.c
1872 @@ -29,7 +29,7 @@
1873 #include <asm/io.h>
1874 #include <crc.h>
1875 #include <environment.h>
1876 -#include <libfdt.h>
1877 +#include <linux/libfdt.h>
1878 #include <nand.h>
1879 #include <net.h>
1880 #include <sy8106a.h>
1881 diff --git a/board/t3corp/t3corp.c b/board/t3corp/t3corp.c
1882 index 586c6f9a62b6..bf596ca244c0 100644
1883 --- a/board/t3corp/t3corp.c
1884 +++ b/board/t3corp/t3corp.c
1885 @@ -7,7 +7,7 @@
1886
1887 #include <common.h>
1888 #include <asm/ppc440.h>
1889 -#include <libfdt.h>
1890 +#include <linux/libfdt.h>
1891 #include <fdt_support.h>
1892 #include <i2c.h>
1893 #include <mtd/cfi_flash.h>
1894 diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
1895 index 09bebeb71b01..23e2ec81c72f 100644
1896 --- a/board/toradex/apalis_imx6/apalis_imx6.c
1897 +++ b/board/toradex/apalis_imx6/apalis_imx6.c
1898 @@ -936,7 +936,7 @@ void ldo_mode_set(int ldo_bypass)
1899
1900 #ifdef CONFIG_SPL_BUILD
1901 #include <spl.h>
1902 -#include <libfdt.h>
1903 +#include <linux/libfdt.h>
1904 #include "asm/arch/mx6q-ddr.h"
1905 #include "asm/arch/iomux.h"
1906 #include "asm/arch/crm_regs.h"
1907 diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
1908 index d070677054b1..d958e9a72758 100644
1909 --- a/board/toradex/colibri_imx6/colibri_imx6.c
1910 +++ b/board/toradex/colibri_imx6/colibri_imx6.c
1911 @@ -740,7 +740,7 @@ void ldo_mode_set(int ldo_bypass)
1912
1913 #ifdef CONFIG_SPL_BUILD
1914 #include <spl.h>
1915 -#include <libfdt.h>
1916 +#include <linux/libfdt.h>
1917 #include "asm/arch/mx6dl-ddr.h"
1918 #include "asm/arch/iomux.h"
1919 #include "asm/arch/crm_regs.h"
1920 diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
1921 index 2c6fc409c109..b4c6a0a1e848 100644
1922 --- a/board/toradex/common/tdx-common.c
1923 +++ b/board/toradex/common/tdx-common.c
1924 @@ -6,7 +6,7 @@
1925
1926 #include <common.h>
1927 #include <g_dnl.h>
1928 -#include <libfdt.h>
1929 +#include <linux/libfdt.h>
1930
1931 #include "tdx-cfg-block.h"
1932 #include "tdx-common.h"
1933 diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
1934 index fef9d2b29a94..b5dffa1cedad 100644
1935 --- a/board/tqc/tqm5200/tqm5200.c
1936 +++ b/board/tqc/tqm5200/tqm5200.c
1937 @@ -16,7 +16,7 @@
1938 #include <mpc5xxx.h>
1939 #include <pci.h>
1940 #include <asm/processor.h>
1941 -#include <libfdt.h>
1942 +#include <linux/libfdt.h>
1943 #include <netdev.h>
1944 #include <video.h>
1945
1946 diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c
1947 index 6d17830575f4..e5f3608bfa0d 100644
1948 --- a/board/tqc/tqm8xx/tqm8xx.c
1949 +++ b/board/tqc/tqm8xx/tqm8xx.c
1950 @@ -13,7 +13,7 @@
1951 #endif
1952
1953 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
1954 -#include <libfdt.h>
1955 +#include <linux/libfdt.h>
1956 #endif
1957
1958 extern flash_info_t flash_info[]; /* FLASH chips info */
1959 diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
1960 index c8fc95d52bc9..fbcfc0b23a1c 100644
1961 --- a/board/tqc/tqma6/tqma6.c
1962 +++ b/board/tqc/tqma6/tqma6.c
1963 @@ -20,7 +20,7 @@
1964 #include <asm/imx-common/spi.h>
1965 #include <common.h>
1966 #include <fsl_esdhc.h>
1967 -#include <libfdt.h>
1968 +#include <linux/libfdt.h>
1969 #include <i2c.h>
1970 #include <mmc.h>
1971 #include <power/pfuze100_pmic.h>
1972 diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
1973 index 4db1a0bb7d04..a34acb851a55 100644
1974 --- a/board/tqc/tqma6/tqma6_mba6.c
1975 +++ b/board/tqc/tqma6/tqma6_mba6.c
1976 @@ -20,7 +20,7 @@
1977
1978 #include <common.h>
1979 #include <fsl_esdhc.h>
1980 -#include <libfdt.h>
1981 +#include <linux/libfdt.h>
1982 #include <malloc.h>
1983 #include <i2c.h>
1984 #include <micrel.h>
1985 diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c
1986 index 2bbb614e4fe9..7ee6861f895d 100644
1987 --- a/board/tqc/tqma6/tqma6_wru4.c
1988 +++ b/board/tqc/tqma6/tqma6_wru4.c
1989 @@ -23,7 +23,7 @@
1990
1991 #include <common.h>
1992 #include <fsl_esdhc.h>
1993 -#include <libfdt.h>
1994 +#include <linux/libfdt.h>
1995 #include <malloc.h>
1996 #include <i2c.h>
1997 #include <micrel.h>
1998 diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
1999 index 530c45f600f2..56140c81ae97 100644
2000 --- a/board/udoo/neo/neo.c
2001 +++ b/board/udoo/neo/neo.c
2002 @@ -445,7 +445,7 @@ int board_late_init(void)
2003
2004 #ifdef CONFIG_SPL_BUILD
2005
2006 -#include <libfdt.h>
2007 +#include <linux/libfdt.h>
2008 #include <asm/arch/mx6-ddr.h>
2009
2010 static const struct mx6sx_iomux_ddr_regs mx6_ddr_ioregs = {
2011 diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c
2012 index 4780e8c147a3..1853b197e7ba 100644
2013 --- a/board/varisys/cyrus/pci.c
2014 +++ b/board/varisys/cyrus/pci.c
2015 @@ -8,7 +8,7 @@
2016 #include <command.h>
2017 #include <pci.h>
2018 #include <asm/fsl_pci.h>
2019 -#include <libfdt.h>
2020 +#include <linux/libfdt.h>
2021 #include <fdt_support.h>
2022 #include <asm/fsl_serdes.h>
2023
2024 diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
2025 index 7f24a30688ac..18a6c83e5883 100644
2026 --- a/board/ve8313/ve8313.c
2027 +++ b/board/ve8313/ve8313.c
2028 @@ -10,7 +10,7 @@
2029 */
2030
2031 #include <common.h>
2032 -#include <libfdt.h>
2033 +#include <linux/libfdt.h>
2034 #include <pci.h>
2035 #include <mpc83xx.h>
2036 #include <ns16550.h>
2037 diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
2038 index d3b1f1564f3c..6c0813ba001a 100644
2039 --- a/board/vscom/baltos/board.c
2040 +++ b/board/vscom/baltos/board.c
2041 @@ -10,7 +10,7 @@
2042
2043 #include <common.h>
2044 #include <errno.h>
2045 -#include <libfdt.h>
2046 +#include <linux/libfdt.h>
2047 #include <spl.h>
2048 #include <asm/arch/cpu.h>
2049 #include <asm/arch/hardware.h>
2050 diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
2051 index 62375717f091..45924cdb4896 100644
2052 --- a/board/xes/common/fsl_8xxx_pci.c
2053 +++ b/board/xes/common/fsl_8xxx_pci.c
2054 @@ -11,7 +11,7 @@
2055 #include <asm/fsl_serdes.h>
2056 #include <asm/io.h>
2057 #include <linux/compiler.h>
2058 -#include <libfdt.h>
2059 +#include <linux/libfdt.h>
2060 #include <fdt_support.h>
2061
2062
2063 diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c
2064 index 6a3df52391e7..4b3a46c8cbfd 100644
2065 --- a/board/xes/xpedite520x/xpedite520x.c
2066 +++ b/board/xes/xpedite520x/xpedite520x.c
2067 @@ -14,7 +14,7 @@
2068 #include <asm/io.h>
2069 #include <asm/cache.h>
2070 #include <asm/mmu.h>
2071 -#include <libfdt.h>
2072 +#include <linux/libfdt.h>
2073 #include <fdt_support.h>
2074 #include <pca953x.h>
2075
2076 diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c
2077 index 41419feb178a..ae606f5ba708 100644
2078 --- a/board/xes/xpedite537x/xpedite537x.c
2079 +++ b/board/xes/xpedite537x/xpedite537x.c
2080 @@ -12,7 +12,7 @@
2081 #include <asm/fsl_pci.h>
2082 #include <asm/io.h>
2083 #include <asm/cache.h>
2084 -#include <libfdt.h>
2085 +#include <linux/libfdt.h>
2086 #include <fdt_support.h>
2087 #include <pca953x.h>
2088
2089 diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c
2090 index 1f05150d0ff2..c90bb89dae0c 100644
2091 --- a/board/xes/xpedite550x/xpedite550x.c
2092 +++ b/board/xes/xpedite550x/xpedite550x.c
2093 @@ -12,7 +12,7 @@
2094 #include <asm/fsl_pci.h>
2095 #include <asm/io.h>
2096 #include <asm/cache.h>
2097 -#include <libfdt.h>
2098 +#include <linux/libfdt.h>
2099 #include <fdt_support.h>
2100 #include <pca953x.h>
2101
2102 diff --git a/cmd/bootefi.c b/cmd/bootefi.c
2103 index 97a0fc9c7ca3..845cb991a113 100644
2104 --- a/cmd/bootefi.c
2105 +++ b/cmd/bootefi.c
2106 @@ -11,8 +11,8 @@
2107 #include <dm/device.h>
2108 #include <efi_loader.h>
2109 #include <errno.h>
2110 -#include <libfdt.h>
2111 -#include <libfdt_env.h>
2112 +#include <linux/libfdt.h>
2113 +#include <linux/libfdt_env.h>
2114 #include <memalign.h>
2115 #include <asm/global_data.h>
2116 #include <asm-generic/sections.h>
2117 diff --git a/cmd/fdt.c b/cmd/fdt.c
2118 index 8bd345afa8a1..d82a03b6d7ad 100644
2119 --- a/cmd/fdt.c
2120 +++ b/cmd/fdt.c
2121 @@ -13,7 +13,7 @@
2122 #include <linux/ctype.h>
2123 #include <linux/types.h>
2124 #include <asm/global_data.h>
2125 -#include <libfdt.h>
2126 +#include <linux/libfdt.h>
2127 #include <fdt_support.h>
2128 #include <mapmem.h>
2129 #include <asm/io.h>
2130 diff --git a/common/board_info.c b/common/board_info.c
2131 index aa45e24b3460..16cf966233ed 100644
2132 --- a/common/board_info.c
2133 +++ b/common/board_info.c
2134 @@ -3,7 +3,7 @@
2135 */
2136
2137 #include <common.h>
2138 -#include <libfdt.h>
2139 +#include <linux/libfdt.h>
2140 #include <linux/compiler.h>
2141
2142 int __weak checkboard(void)
2143 diff --git a/common/bootm_os.c b/common/bootm_os.c
2144 index e3f5a4641207..c2018a135d85 100644
2145 --- a/common/bootm_os.c
2146 +++ b/common/bootm_os.c
2147 @@ -8,7 +8,7 @@
2148 #include <common.h>
2149 #include <bootm.h>
2150 #include <fdt_support.h>
2151 -#include <libfdt.h>
2152 +#include <linux/libfdt.h>
2153 #include <malloc.h>
2154 #include <vxworks.h>
2155
2156 diff --git a/common/bootstage.c b/common/bootstage.c
2157 index 35bce3d881a5..800645ed8fdf 100644
2158 --- a/common/bootstage.c
2159 +++ b/common/bootstage.c
2160 @@ -13,7 +13,7 @@
2161 */
2162
2163 #include <common.h>
2164 -#include <libfdt.h>
2165 +#include <linux/libfdt.h>
2166 #include <malloc.h>
2167 #include <linux/compiler.h>
2168
2169 diff --git a/common/fdt_support.c b/common/fdt_support.c
2170 index c9f7019e38e8..6f83bfa2b43a 100644
2171 --- a/common/fdt_support.c
2172 +++ b/common/fdt_support.c
2173 @@ -13,7 +13,7 @@
2174 #include <linux/ctype.h>
2175 #include <linux/types.h>
2176 #include <asm/global_data.h>
2177 -#include <libfdt.h>
2178 +#include <linux/libfdt.h>
2179 #include <fdt_support.h>
2180 #include <exports.h>
2181 #include <fdtdec.h>
2182 diff --git a/common/image-fdt.c b/common/image-fdt.c
2183 index e7540be8d631..49e3125f0b8c 100644
2184 --- a/common/image-fdt.c
2185 +++ b/common/image-fdt.c
2186 @@ -13,7 +13,7 @@
2187 #include <fdt_support.h>
2188 #include <errno.h>
2189 #include <image.h>
2190 -#include <libfdt.h>
2191 +#include <linux/libfdt.h>
2192 #include <mapmem.h>
2193 #include <asm/io.h>
2194
2195 diff --git a/common/image.c b/common/image.c
2196 index 8c35327745ba..7bbec78823b9 100644
2197 --- a/common/image.c
2198 +++ b/common/image.c
2199 @@ -30,7 +30,7 @@
2200 #include <mapmem.h>
2201
2202 #if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT
2203 -#include <libfdt.h>
2204 +#include <linux/libfdt.h>
2205 #include <fdt_support.h>
2206 #include <fpga.h>
2207 #include <xilinx.h>
2208 @@ -862,7 +862,7 @@ ulong genimg_get_kernel_addr(char * const img_addr)
2209 *
2210 * New uImage format and FDT blob are based on a libfdt. FDT blob
2211 * may be passed directly or embedded in a FIT image. In both situations
2212 - * genimg_get_format() must be able to dectect libfdt header.
2213 + * genimg_get_format() must be able to dectect linux/libfdt.header.
2214 *
2215 * returns:
2216 * image format type or IMAGE_FORMAT_INVALID if no image is present
2217 diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
2218 index 2ba00f6d34c0..5ec3ece900de 100644
2219 --- a/common/lcd_simplefb.c
2220 +++ b/common/lcd_simplefb.c
2221 @@ -10,7 +10,7 @@
2222 #include <common.h>
2223 #include <lcd.h>
2224 #include <fdt_support.h>
2225 -#include <libfdt.h>
2226 +#include <linux/libfdt.h>
2227
2228 DECLARE_GLOBAL_DATA_PTR;
2229
2230 diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
2231 index a14acceebb3d..c884402b24b8 100644
2232 --- a/common/spl/spl_fat.c
2233 +++ b/common/spl/spl_fat.c
2234 @@ -15,7 +15,7 @@
2235 #include <fat.h>
2236 #include <errno.h>
2237 #include <image.h>
2238 -#include <libfdt.h>
2239 +#include <linux/libfdt.h>
2240
2241 static int fat_registered;
2242
2243 diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
2244 index aae556f97dfd..8ab600887ee9 100644
2245 --- a/common/spl/spl_fit.c
2246 +++ b/common/spl/spl_fit.c
2247 @@ -8,7 +8,7 @@
2248 #include <common.h>
2249 #include <errno.h>
2250 #include <image.h>
2251 -#include <libfdt.h>
2252 +#include <linux/libfdt.h>
2253 #include <spl.h>
2254
2255 static ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
2256 diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
2257 index cd39f9be9d3c..d07598537450 100644
2258 --- a/common/spl/spl_nand.c
2259 +++ b/common/spl/spl_nand.c
2260 @@ -9,7 +9,7 @@
2261 #include <spl.h>
2262 #include <asm/io.h>
2263 #include <nand.h>
2264 -#include <libfdt_env.h>
2265 +#include <linux/libfdt_env.h>
2266 #include <fdt.h>
2267
2268 #if defined(CONFIG_SPL_NAND_RAW_ONLY)
2269 diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
2270 index ff8085b795e6..4ab3dcd624d4 100644
2271 --- a/common/spl/spl_ymodem.c
2272 +++ b/common/spl/spl_ymodem.c
2273 @@ -14,7 +14,7 @@
2274 #include <xyzModem.h>
2275 #include <asm/u-boot.h>
2276 #include <asm/utils.h>
2277 -#include <libfdt.h>
2278 +#include <linux/libfdt.h>
2279
2280 #define BUF_SIZE 1024
2281
2282 diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
2283 index c68bcba54f1e..b7e72fd16484 100644
2284 --- a/drivers/core/regmap.c
2285 +++ b/drivers/core/regmap.c
2286 @@ -8,7 +8,7 @@
2287 #include <common.h>
2288 #include <dm.h>
2289 #include <errno.h>
2290 -#include <libfdt.h>
2291 +#include <linux/libfdt.h>
2292 #include <malloc.h>
2293 #include <mapmem.h>
2294 #include <regmap.h>
2295 diff --git a/drivers/core/root.c b/drivers/core/root.c
2296 index 9edfc1efb661..1cc2a72be3ff 100644
2297 --- a/drivers/core/root.c
2298 +++ b/drivers/core/root.c
2299 @@ -11,7 +11,7 @@
2300 #include <errno.h>
2301 #include <fdtdec.h>
2302 #include <malloc.h>
2303 -#include <libfdt.h>
2304 +#include <linux/libfdt.h>
2305 #include <dm/device.h>
2306 #include <dm/device-internal.h>
2307 #include <dm/lists.h>
2308 diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
2309 index 0940faf768cc..470e662d8e3e 100644
2310 --- a/drivers/crypto/fsl/sec.c
2311 +++ b/drivers/crypto/fsl/sec.c
2312 @@ -5,7 +5,7 @@
2313 */
2314
2315 #include <common.h>
2316 -#include <libfdt.h>
2317 +#include <linux/libfdt.h>
2318 #include <fdt_support.h>
2319 #if CONFIG_SYS_FSL_SEC_COMPAT == 2 || CONFIG_SYS_FSL_SEC_COMPAT >= 4
2320 #include <fsl_sec.h>
2321 diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
2322 index c440399a09cf..01d2455e5201 100644
2323 --- a/drivers/mmc/exynos_dw_mmc.c
2324 +++ b/drivers/mmc/exynos_dw_mmc.c
2325 @@ -8,7 +8,7 @@
2326 #include <common.h>
2327 #include <dwmmc.h>
2328 #include <fdtdec.h>
2329 -#include <libfdt.h>
2330 +#include <linux/libfdt.h>
2331 #include <malloc.h>
2332 #include <errno.h>
2333 #include <asm/arch/dwmmc.h>
2334 diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
2335 index c56e1a3a1c5b..bbf815adb419 100644
2336 --- a/drivers/mmc/rockchip_sdhci.c
2337 +++ b/drivers/mmc/rockchip_sdhci.c
2338 @@ -9,7 +9,7 @@
2339 #include <common.h>
2340 #include <dm.h>
2341 #include <fdtdec.h>
2342 -#include <libfdt.h>
2343 +#include <linux/libfdt.h>
2344 #include <malloc.h>
2345 #include <sdhci.h>
2346
2347 diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
2348 index ac737e0f0f26..917b4ca7db29 100644
2349 --- a/drivers/mmc/s5p_sdhci.c
2350 +++ b/drivers/mmc/s5p_sdhci.c
2351 @@ -10,7 +10,7 @@
2352 #include <malloc.h>
2353 #include <sdhci.h>
2354 #include <fdtdec.h>
2355 -#include <libfdt.h>
2356 +#include <linux/libfdt.h>
2357 #include <asm/gpio.h>
2358 #include <asm/arch/mmc.h>
2359 #include <asm/arch/clk.h>
2360 diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
2361 index 0a22e582957f..0585e627cb10 100644
2362 --- a/drivers/mmc/socfpga_dw_mmc.c
2363 +++ b/drivers/mmc/socfpga_dw_mmc.c
2364 @@ -11,7 +11,7 @@
2365 #include <dwmmc.h>
2366 #include <errno.h>
2367 #include <fdtdec.h>
2368 -#include <libfdt.h>
2369 +#include <linux/libfdt.h>
2370 #include <linux/err.h>
2371 #include <malloc.h>
2372
2373 diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
2374 index 3da138562ab9..72bf9f102eda 100644
2375 --- a/drivers/mmc/zynq_sdhci.c
2376 +++ b/drivers/mmc/zynq_sdhci.c
2377 @@ -9,7 +9,7 @@
2378 #include <common.h>
2379 #include <dm.h>
2380 #include <fdtdec.h>
2381 -#include <libfdt.h>
2382 +#include <linux/libfdt.h>
2383 #include <malloc.h>
2384 #include <sdhci.h>
2385
2386 diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
2387 index 46b8a6bc6991..2c18d582a699 100644
2388 --- a/drivers/net/fsl-mc/mc.c
2389 +++ b/drivers/net/fsl-mc/mc.c
2390 @@ -7,7 +7,7 @@
2391 #include <errno.h>
2392 #include <linux/bug.h>
2393 #include <asm/io.h>
2394 -#include <libfdt.h>
2395 +#include <linux/libfdt.h>
2396 #include <fdt_support.h>
2397 #include <fsl-mc/fsl_mc.h>
2398 #include <fsl-mc/fsl_mc_sys.h>
2399 diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
2400 index 52792dcd5973..4ca743e65036 100644
2401 --- a/drivers/pci/fsl_pci_init.c
2402 +++ b/drivers/pci/fsl_pci_init.c
2403 @@ -879,7 +879,7 @@ int fsl_pcie_init_board(int busno)
2404 #endif
2405
2406 #ifdef CONFIG_OF_BOARD_SETUP
2407 -#include <libfdt.h>
2408 +#include <linux/libfdt.h>
2409 #include <fdt_support.h>
2410
2411 void ft_fsl_pci_setup(void *blob, const char *pci_compat,
2412 diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
2413 index 0f8e3c9fcbdc..dcea1924182d 100644
2414 --- a/drivers/pci/pci-emul-uclass.c
2415 +++ b/drivers/pci/pci-emul-uclass.c
2416 @@ -8,7 +8,7 @@
2417 #include <common.h>
2418 #include <dm.h>
2419 #include <fdtdec.h>
2420 -#include <libfdt.h>
2421 +#include <linux/libfdt.h>
2422 #include <pci.h>
2423 #include <dm/lists.h>
2424
2425 diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
2426 index 2e6b986dbce1..763121114517 100644
2427 --- a/drivers/pci/pcie_layerscape.c
2428 +++ b/drivers/pci/pcie_layerscape.c
2429 @@ -769,7 +769,7 @@ void pci_init_board(void)
2430 }
2431
2432 #ifdef CONFIG_OF_BOARD_SETUP
2433 -#include <libfdt.h>
2434 +#include <linux/libfdt.h>
2435 #include <fdt_support.h>
2436
2437 static void ft_pcie_ls_setup(void *blob, const char *pci_compat,
2438 diff --git a/drivers/pci/tsi108_pci.c b/drivers/pci/tsi108_pci.c
2439 index d48e1e6fe651..bce8b79b68f1 100644
2440 --- a/drivers/pci/tsi108_pci.c
2441 +++ b/drivers/pci/tsi108_pci.c
2442 @@ -16,7 +16,7 @@
2443 #include <asm/io.h>
2444 #include <tsi108.h>
2445 #if defined(CONFIG_OF_LIBFDT)
2446 -#include <libfdt.h>
2447 +#include <linux/libfdt.h>
2448 #include <fdt_support.h>
2449 #endif
2450
2451 diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
2452 index 02ab9b4afde6..1a492a387a9c 100644
2453 --- a/drivers/pinctrl/pinctrl-uclass.c
2454 +++ b/drivers/pinctrl/pinctrl-uclass.c
2455 @@ -5,7 +5,7 @@
2456 */
2457
2458 #include <common.h>
2459 -#include <libfdt.h>
2460 +#include <linux/libfdt.h>
2461 #include <linux/err.h>
2462 #include <linux/list.h>
2463 #include <dm/device.h>
2464 diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c
2465 index e8164bfd08af..5c44c07adf83 100644
2466 --- a/drivers/power/pmic/act8846.c
2467 +++ b/drivers/power/pmic/act8846.c
2468 @@ -9,7 +9,7 @@
2469 #include <dm.h>
2470 #include <errno.h>
2471 #include <fdtdec.h>
2472 -#include <libfdt.h>
2473 +#include <linux/libfdt.h>
2474 #include <power/act8846_pmic.h>
2475 #include <power/pmic.h>
2476
2477 diff --git a/drivers/power/pmic/rk808.c b/drivers/power/pmic/rk808.c
2478 index 770f471672e8..e53fbd8c5634 100644
2479 --- a/drivers/power/pmic/rk808.c
2480 +++ b/drivers/power/pmic/rk808.c
2481 @@ -9,7 +9,7 @@
2482 #include <dm.h>
2483 #include <errno.h>
2484 #include <fdtdec.h>
2485 -#include <libfdt.h>
2486 +#include <linux/libfdt.h>
2487 #include <power/rk808_pmic.h>
2488 #include <power/pmic.h>
2489
2490 diff --git a/drivers/power/pmic/rn5t567.c b/drivers/power/pmic/rn5t567.c
2491 index 001e69553e8a..9e5b0b119b13 100644
2492 --- a/drivers/power/pmic/rn5t567.c
2493 +++ b/drivers/power/pmic/rn5t567.c
2494 @@ -9,7 +9,7 @@
2495 #include <dm.h>
2496 #include <errno.h>
2497 #include <fdtdec.h>
2498 -#include <libfdt.h>
2499 +#include <linux/libfdt.h>
2500 #include <power/rn5t567_pmic.h>
2501 #include <power/pmic.h>
2502
2503 diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
2504 index b0a4c5da6d80..bc45e63b3106 100644
2505 --- a/drivers/power/regulator/pwm_regulator.c
2506 +++ b/drivers/power/regulator/pwm_regulator.c
2507 @@ -13,7 +13,7 @@
2508 #include <errno.h>
2509 #include <pwm.h>
2510 #include <power/regulator.h>
2511 -#include <libfdt.h>
2512 +#include <linux/libfdt.h>
2513 #include <fdt_support.h>
2514 #include <fdtdec.h>
2515
2516 diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c
2517 index 4f48f984ab58..9bbdc60353ba 100644
2518 --- a/drivers/qe/fdt.c
2519 +++ b/drivers/qe/fdt.c
2520 @@ -8,7 +8,7 @@
2521 */
2522
2523 #include <common.h>
2524 -#include <libfdt.h>
2525 +#include <linux/libfdt.h>
2526 #include <fdt_support.h>
2527 #include <fsl_qe.h>
2528
2529 diff --git a/drivers/sound/sound-i2s.c b/drivers/sound/sound-i2s.c
2530 index 749bbbd0318b..be69fb0b010b 100644
2531 --- a/drivers/sound/sound-i2s.c
2532 +++ b/drivers/sound/sound-i2s.c
2533 @@ -8,7 +8,7 @@
2534 #include <malloc.h>
2535 #include <common.h>
2536 #include <asm/io.h>
2537 -#include <libfdt.h>
2538 +#include <linux/libfdt.h>
2539 #include <fdtdec.h>
2540 #include <i2c.h>
2541 #include <i2s.h>
2542 diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
2543 index 35c2dc18d955..1b99d4810d02 100644
2544 --- a/drivers/usb/common/common.c
2545 +++ b/drivers/usb/common/common.c
2546 @@ -8,7 +8,7 @@
2547 */
2548
2549 #include <common.h>
2550 -#include <libfdt.h>
2551 +#include <linux/libfdt.h>
2552 #include <linux/usb/otg.h>
2553
2554 DECLARE_GLOBAL_DATA_PTR;
2555 diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
2556 index 53281d78b35f..b3e693c6966a 100644
2557 --- a/drivers/usb/host/ehci-exynos.c
2558 +++ b/drivers/usb/host/ehci-exynos.c
2559 @@ -10,7 +10,7 @@
2560 #include <common.h>
2561 #include <dm.h>
2562 #include <fdtdec.h>
2563 -#include <libfdt.h>
2564 +#include <linux/libfdt.h>
2565 #include <malloc.h>
2566 #include <usb.h>
2567 #include <asm/arch/cpu.h>
2568 diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
2569 index 6484c1c33440..5d31ad846369 100644
2570 --- a/drivers/usb/host/ehci-msm.c
2571 +++ b/drivers/usb/host/ehci-msm.c
2572 @@ -12,7 +12,7 @@
2573 #include <dm.h>
2574 #include <errno.h>
2575 #include <fdtdec.h>
2576 -#include <libfdt.h>
2577 +#include <linux/libfdt.h>
2578 #include <usb.h>
2579 #include <usb/ehci-ci.h>
2580 #include <usb/ulpi.h>
2581 diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
2582 index e3620da15fb1..ad61be7c9552 100644
2583 --- a/drivers/usb/host/ehci-tegra.c
2584 +++ b/drivers/usb/host/ehci-tegra.c
2585 @@ -16,7 +16,7 @@
2586 #include <asm/arch-tegra/clk_rst.h>
2587 #include <usb.h>
2588 #include <usb/ulpi.h>
2589 -#include <libfdt.h>
2590 +#include <linux/libfdt.h>
2591 #include <fdtdec.h>
2592
2593 #include "ehci.h"
2594 diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
2595 index f389bff1718f..b86661c6fb01 100644
2596 --- a/drivers/usb/host/ehci-vf.c
2597 +++ b/drivers/usb/host/ehci-vf.c
2598 @@ -20,7 +20,7 @@
2599 #include <asm/imx-common/iomux-v3.h>
2600 #include <asm/imx-common/regs-usbphy.h>
2601 #include <usb/ehci-ci.h>
2602 -#include <libfdt.h>
2603 +#include <linux/libfdt.h>
2604 #include <fdtdec.h>
2605
2606 #include "ehci.h"
2607 diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
2608 index 82fcd84ef2f2..8b0b5bf86e97 100644
2609 --- a/drivers/usb/host/xhci-exynos5.c
2610 +++ b/drivers/usb/host/xhci-exynos5.c
2611 @@ -16,7 +16,7 @@
2612 #include <common.h>
2613 #include <dm.h>
2614 #include <fdtdec.h>
2615 -#include <libfdt.h>
2616 +#include <linux/libfdt.h>
2617 #include <malloc.h>
2618 #include <usb.h>
2619 #include <watchdog.h>
2620 diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c
2621 index 8cbcb8f923e0..34996bea6954 100644
2622 --- a/drivers/usb/host/xhci-rockchip.c
2623 +++ b/drivers/usb/host/xhci-rockchip.c
2624 @@ -7,7 +7,7 @@
2625 #include <common.h>
2626 #include <dm.h>
2627 #include <fdtdec.h>
2628 -#include <libfdt.h>
2629 +#include <linux/libfdt.h>
2630 #include <malloc.h>
2631 #include <usb.h>
2632 #include <watchdog.h>
2633 diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c
2634 index 1958478d6281..01bda15bd606 100644
2635 --- a/drivers/usb/phy/rockchip_usb2_phy.c
2636 +++ b/drivers/usb/phy/rockchip_usb2_phy.c
2637 @@ -6,7 +6,7 @@
2638
2639 #include <common.h>
2640 #include <asm/io.h>
2641 -#include <libfdt.h>
2642 +#include <linux/libfdt.h>
2643
2644 #include "../gadget/dwc2_udc_otg_priv.h"
2645
2646 diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
2647 index fc39f2c5620b..d034f1e53b9f 100644
2648 --- a/drivers/video/exynos/exynos_dp.c
2649 +++ b/drivers/video/exynos/exynos_dp.c
2650 @@ -11,7 +11,7 @@
2651 #include <common.h>
2652 #include <display.h>
2653 #include <fdtdec.h>
2654 -#include <libfdt.h>
2655 +#include <linux/libfdt.h>
2656 #include <malloc.h>
2657 #include <video_bridge.h>
2658 #include <linux/compat.h>
2659 diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c
2660 index aae78a8159ca..f84dd7097f69 100644
2661 --- a/drivers/video/exynos/exynos_dp_lowlevel.c
2662 +++ b/drivers/video/exynos/exynos_dp_lowlevel.c
2663 @@ -13,7 +13,7 @@
2664 #include <asm/arch/dp_info.h>
2665 #include <asm/arch/dp.h>
2666 #include <fdtdec.h>
2667 -#include <libfdt.h>
2668 +#include <linux/libfdt.h>
2669 #include "exynos_dp_lowlevel.h"
2670
2671 /* Declare global data pointer */
2672 diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
2673 index 5483d6613f76..0b7e74ae17a4 100644
2674 --- a/drivers/video/exynos/exynos_fb.c
2675 +++ b/drivers/video/exynos/exynos_fb.c
2676 @@ -13,7 +13,7 @@
2677 #include <div64.h>
2678 #include <dm.h>
2679 #include <fdtdec.h>
2680 -#include <libfdt.h>
2681 +#include <linux/libfdt.h>
2682 #include <panel.h>
2683 #include <video.h>
2684 #include <video_bridge.h>
2685 diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
2686 index a5d9b5921868..724d08f7ae4a 100644
2687 --- a/drivers/video/exynos/exynos_mipi_dsi.c
2688 +++ b/drivers/video/exynos/exynos_mipi_dsi.c
2689 @@ -10,7 +10,7 @@
2690 #include <common.h>
2691 #include <malloc.h>
2692 #include <fdtdec.h>
2693 -#include <libfdt.h>
2694 +#include <linux/libfdt.h>
2695 #include <linux/compat.h>
2696 #include <linux/err.h>
2697 #include <asm/arch/dsim.h>
2698 diff --git a/include/fdt_support.h b/include/fdt_support.h
2699 index 955c12171331..471d6694991b 100644
2700 --- a/include/fdt_support.h
2701 +++ b/include/fdt_support.h
2702 @@ -10,7 +10,7 @@
2703
2704 #ifdef CONFIG_OF_LIBFDT
2705
2706 -#include <libfdt.h>
2707 +#include <linux/libfdt.h>
2708
2709 u32 fdt_getprop_u32_default_node(const void *fdt, int off, int cell,
2710 const char *prop, const u32 dflt);
2711 diff --git a/include/fdtdec.h b/include/fdtdec.h
2712 index d074478f1415..90025987afdc 100644
2713 --- a/include/fdtdec.h
2714 +++ b/include/fdtdec.h
2715 @@ -14,7 +14,7 @@
2716 * changes to support FDT are minimized.
2717 */
2718
2719 -#include <libfdt.h>
2720 +#include <linux/libfdt.h>
2721 #include <pci.h>
2722
2723 /*
2724 diff --git a/include/image.h b/include/image.h
2725 index 05376783fb10..40943eac4b7f 100644
2726 --- a/include/image.h
2727 +++ b/include/image.h
2728 @@ -50,7 +50,7 @@ struct lmb;
2729
2730 #if IMAGE_ENABLE_FIT
2731 #include <hash.h>
2732 -#include <libfdt.h>
2733 +#include <linux/libfdt.h>
2734 #include <fdt_support.h>
2735 # ifdef CONFIG_SPL_BUILD
2736 # ifdef CONFIG_SPL_CRC32_SUPPORT
2737 diff --git a/include/libfdt.h b/include/linux/libfdt.h
2738 similarity index 99%
2739 rename from include/libfdt.h
2740 rename to include/linux/libfdt.h
2741 index e2bc2e00c184..48476cd443f8 100644
2742 --- a/include/libfdt.h
2743 +++ b/include/linux/libfdt.h
2744 @@ -51,7 +51,7 @@
2745 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2746 */
2747
2748 -#include <libfdt_env.h>
2749 +#include <linux/libfdt_env.h>
2750 #include <fdt.h>
2751
2752 #define FDT_FIRST_SUPPORTED_VERSION 0x10
2753 diff --git a/include/libfdt_env.h b/include/linux/libfdt_env.h
2754 similarity index 94%
2755 rename from include/libfdt_env.h
2756 rename to include/linux/libfdt_env.h
2757 index 6c6845f76cf7..7094a596b314 100644
2758 --- a/include/libfdt_env.h
2759 +++ b/include/linux/libfdt_env.h
2760 @@ -9,8 +9,8 @@
2761 #ifndef _LIBFDT_ENV_H
2762 #define _LIBFDT_ENV_H
2763
2764 -#include "compiler.h"
2765 -#include "linux/types.h"
2766 +#include "../compiler.h"
2767 +#include "types.h"
2768
2769 extern struct fdt_header *working_fdt; /* Pointer to the working fdt */
2770
2771 diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
2772 index 51080cbeed2f..6d54830dcb6e 100644
2773 --- a/lib/efi_loader/efi_boottime.c
2774 +++ b/lib/efi_loader/efi_boottime.c
2775 @@ -10,7 +10,7 @@
2776 #include <efi_loader.h>
2777 #include <malloc.h>
2778 #include <asm/global_data.h>
2779 -#include <libfdt_env.h>
2780 +#include <linux/libfdt_env.h>
2781 #include <u-boot/crc.h>
2782 #include <bootm.h>
2783 #include <inttypes.h>
2784 diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
2785 index 95aa590c8af7..a69a67465e41 100644
2786 --- a/lib/efi_loader/efi_memory.c
2787 +++ b/lib/efi_loader/efi_memory.c
2788 @@ -10,7 +10,7 @@
2789 #include <efi_loader.h>
2790 #include <malloc.h>
2791 #include <asm/global_data.h>
2792 -#include <libfdt_env.h>
2793 +#include <linux/libfdt_env.h>
2794 #include <linux/list_sort.h>
2795 #include <inttypes.h>
2796 #include <watchdog.h>
2797 diff --git a/lib/fdtdec.c b/lib/fdtdec.c
2798 index 81f47ef2c7f4..a4f78246dfb9 100644
2799 --- a/lib/fdtdec.c
2800 +++ b/lib/fdtdec.c
2801 @@ -8,7 +8,7 @@
2802 #include <dm.h>
2803 #include <errno.h>
2804 #include <serial.h>
2805 -#include <libfdt.h>
2806 +#include <linux/libfdt.h>
2807 #include <fdt_support.h>
2808 #include <fdtdec.h>
2809 #include <asm/sections.h>
2810 diff --git a/lib/fdtdec_common.c b/lib/fdtdec_common.c
2811 index 63b704a3d719..656a6bf626a9 100644
2812 --- a/lib/fdtdec_common.c
2813 +++ b/lib/fdtdec_common.c
2814 @@ -10,10 +10,10 @@
2815
2816 #ifndef USE_HOSTCC
2817 #include <common.h>
2818 -#include <libfdt.h>
2819 +#include <linux/libfdt.h>
2820 #include <fdtdec.h>
2821 #else
2822 -#include "libfdt.h"
2823 +#include "linux/libfdt.h"
2824 #include "fdt_support.h"
2825
2826 #define debug(...)
2827 diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
2828 index cc8b918f64da..c51ffd7ecf72 100644
2829 --- a/lib/fdtdec_test.c
2830 +++ b/lib/fdtdec_test.c
2831 @@ -8,7 +8,7 @@
2832
2833 #include <common.h>
2834 #include <fdtdec.h>
2835 -#include <libfdt.h>
2836 +#include <linux/libfdt.h>
2837 #include <malloc.h>
2838 #include <os.h>
2839
2840 diff --git a/lib/libfdt/fdt.c b/lib/libfdt/fdt.c
2841 index 2055734012a1..2fdd92b34210 100644
2842 --- a/lib/libfdt/fdt.c
2843 +++ b/lib/libfdt/fdt.c
2844 @@ -3,11 +3,11 @@
2845 * Copyright (C) 2006 David Gibson, IBM Corporation.
2846 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
2847 */
2848 -#include <libfdt_env.h>
2849 +#include <linux/libfdt_env.h>
2850
2851 #ifndef USE_HOSTCC
2852 #include <fdt.h>
2853 -#include <libfdt.h>
2854 +#include <linux/libfdt.h>
2855 #else
2856 #include "fdt_host.h"
2857 #endif
2858 diff --git a/lib/libfdt/fdt_addresses.c b/lib/libfdt/fdt_addresses.c
2859 index b6bc66ea3237..e1e7a5bac0db 100644
2860 --- a/lib/libfdt/fdt_addresses.c
2861 +++ b/lib/libfdt/fdt_addresses.c
2862 @@ -3,11 +3,11 @@
2863 * Copyright (C) 2014 David Gibson <david@gibson.dropbear.id.au>
2864 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
2865 */
2866 -#include <libfdt_env.h>
2867 +#include <linux/libfdt_env.h>
2868
2869 #ifndef USE_HOSTCC
2870 #include <fdt.h>
2871 -#include <libfdt.h>
2872 +#include <linux/libfdt.h>
2873 #else
2874 #include "fdt_host.h"
2875 #endif
2876 diff --git a/lib/libfdt/fdt_empty_tree.c b/lib/libfdt/fdt_empty_tree.c
2877 index 6fde1eb9eda0..e6ca82c1621c 100644
2878 --- a/lib/libfdt/fdt_empty_tree.c
2879 +++ b/lib/libfdt/fdt_empty_tree.c
2880 @@ -3,9 +3,9 @@
2881 * Copyright (C) 2012 David Gibson, IBM Corporation.
2882 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
2883 */
2884 -#include <libfdt_env.h>
2885 +#include <linux/libfdt_env.h>
2886 #include <fdt.h>
2887 -#include <libfdt.h>
2888 +#include <linux/libfdt.h>
2889
2890 #include "libfdt_internal.h"
2891
2892 diff --git a/lib/libfdt/fdt_overlay.c b/lib/libfdt/fdt_overlay.c
2893 index bb4140412971..f819dc2a2cea 100644
2894 --- a/lib/libfdt/fdt_overlay.c
2895 +++ b/lib/libfdt/fdt_overlay.c
2896 @@ -1,7 +1,7 @@
2897 -#include "libfdt_env.h"
2898 +#include "linux/libfdt_env.h"
2899
2900 #include <fdt.h>
2901 -#include <libfdt.h>
2902 +#include <linux/libfdt.h>
2903
2904 #include "libfdt_internal.h"
2905
2906 diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c
2907 index d2ce4c1c537b..11d64a7267b7 100644
2908 --- a/lib/libfdt/fdt_region.c
2909 +++ b/lib/libfdt/fdt_region.c
2910 @@ -5,11 +5,11 @@
2911 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
2912 */
2913
2914 -#include <libfdt_env.h>
2915 +#include <linux/libfdt_env.h>
2916
2917 #ifndef USE_HOSTCC
2918 #include <fdt.h>
2919 -#include <libfdt.h>
2920 +#include <linux/libfdt.h>
2921 #else
2922 #include "fdt_host.h"
2923 #endif
2924 diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c
2925 index 1be9538fd277..d972d031c6ba 100644
2926 --- a/lib/libfdt/fdt_ro.c
2927 +++ b/lib/libfdt/fdt_ro.c
2928 @@ -3,11 +3,11 @@
2929 * Copyright (C) 2006 David Gibson, IBM Corporation.
2930 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
2931 */
2932 -#include <libfdt_env.h>
2933 +#include <linux/libfdt_env.h>
2934
2935 #ifndef USE_HOSTCC
2936 #include <fdt.h>
2937 -#include <libfdt.h>
2938 +#include <linux/libfdt.h>
2939 #else
2940 #include "fdt_host.h"
2941 #endif
2942 diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c
2943 index 87d4030fb14d..708c15ccb987 100644
2944 --- a/lib/libfdt/fdt_rw.c
2945 +++ b/lib/libfdt/fdt_rw.c
2946 @@ -3,11 +3,11 @@
2947 * Copyright (C) 2006 David Gibson, IBM Corporation.
2948 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
2949 */
2950 -#include <libfdt_env.h>
2951 +#include <linux/libfdt_env.h>
2952
2953 #ifndef USE_HOSTCC
2954 #include <fdt.h>
2955 -#include <libfdt.h>
2956 +#include <linux/libfdt.h>
2957 #else
2958 #include "fdt_host.h"
2959 #endif
2960 diff --git a/lib/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c
2961 index 7f8e02b1ee21..5475cf2ee597 100644
2962 --- a/lib/libfdt/fdt_strerror.c
2963 +++ b/lib/libfdt/fdt_strerror.c
2964 @@ -3,11 +3,11 @@
2965 * Copyright (C) 2006 David Gibson, IBM Corporation.
2966 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
2967 */
2968 -#include <libfdt_env.h>
2969 +#include <linux/libfdt_env.h>
2970
2971 #ifndef USE_HOSTCC
2972 #include <fdt.h>
2973 -#include <libfdt.h>
2974 +#include <linux/libfdt.h>
2975 #else
2976 #include "fdt_host.h"
2977 #endif
2978 diff --git a/lib/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c
2979 index 70fd02655073..5fcd79377c20 100644
2980 --- a/lib/libfdt/fdt_sw.c
2981 +++ b/lib/libfdt/fdt_sw.c
2982 @@ -3,9 +3,9 @@
2983 * Copyright (C) 2006 David Gibson, IBM Corporation.
2984 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
2985 */
2986 -#include <libfdt_env.h>
2987 +#include <linux/libfdt_env.h>
2988 #include <fdt.h>
2989 -#include <libfdt.h>
2990 +#include <linux/libfdt.h>
2991
2992 #include "libfdt_internal.h"
2993
2994 diff --git a/lib/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c
2995 index 45fb9641206f..cb8ee96f5a13 100644
2996 --- a/lib/libfdt/fdt_wip.c
2997 +++ b/lib/libfdt/fdt_wip.c
2998 @@ -3,11 +3,11 @@
2999 * Copyright (C) 2006 David Gibson, IBM Corporation.
3000 * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
3001 */
3002 -#include <libfdt_env.h>
3003 +#include <linux/libfdt_env.h>
3004
3005 #ifndef USE_HOSTCC
3006 #include <fdt.h>
3007 -#include <libfdt.h>
3008 +#include <linux/libfdt.h>
3009 #else
3010 #include "fdt_host.h"
3011 #endif
3012 diff --git a/lib/libfdt/libfdt.swig b/lib/libfdt/libfdt.swig
3013 index b24c72b1a22b..58a3b2840180 100644
3014 --- a/lib/libfdt/libfdt.swig
3015 +++ b/lib/libfdt/libfdt.swig
3016 @@ -3,7 +3,7 @@
3017
3018 %{
3019 #define SWIG_FILE_WITH_INIT
3020 -#include "libfdt.h"
3021 +#include "linux/libfdt.h"
3022 %}
3023
3024 %pythoncode %{
3025 diff --git a/tools/Makefile b/tools/Makefile
3026 index 5b81dde4b069..96bfbbe9c7e4 100644
3027 --- a/tools/Makefile
3028 +++ b/tools/Makefile
3029 @@ -237,7 +237,7 @@ LICENSE-$(CONFIG_CMD_LICENSE) += $(LICENSE_H)
3030 # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
3031 # Define _GNU_SOURCE to obtain the getline prototype from stdio.h
3032 #
3033 -HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
3034 +HOST_EXTRACFLAGS += -include $(srctree)/include/linux/libfdt_env.h \
3035 $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
3036 -I$(srctree)/lib/libfdt \
3037 -I$(srctree)/tools \
3038 diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py
3039 index 11050b66f710..a891d1c74746 100755
3040 --- a/tools/dtoc/dtoc.py
3041 +++ b/tools/dtoc/dtoc.py
3042 @@ -260,7 +260,7 @@ class DtbPlatdata:
3043 README.of-plat for more information.
3044 """
3045 self.Out('#include <stdbool.h>\n')
3046 - self.Out('#include <libfdt.h>\n')
3047 + self.Out('#include <linux/libfdt.h>\n')
3048
3049 # Output the struct definition
3050 for name in sorted(structs):
3051 diff --git a/tools/fdt_host.h b/tools/fdt_host.h
3052 index 134d9657139b..d8ea8de1ec33 100644
3053 --- a/tools/fdt_host.h
3054 +++ b/tools/fdt_host.h
3055 @@ -8,7 +8,7 @@
3056 #define __FDT_HOST_H__
3057
3058 /* Make sure to include u-boot version of libfdt include files */
3059 -#include "../include/libfdt.h"
3060 +#include "../include/linux/libfdt.h"
3061 #include "../include/fdt_support.h"
3062
3063 int fit_check_sign(const void *working_fdt, const void *key);
3064 diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
3065 index b9078273c954..fbe38c824a41 100644
3066 --- a/tools/fdtgrep.c
3067 +++ b/tools/fdtgrep.c
3068 @@ -16,7 +16,7 @@
3069 #include <string.h>
3070 #include <unistd.h>
3071
3072 -#include <../include/libfdt.h>
3073 +#include <../include/linux/libfdt.h>
3074 #include <libfdt_internal.h>
3075
3076 /* Define DEBUG to get some debugging output on stderr */
3077 diff --git a/tools/ifdtool.c b/tools/ifdtool.c
3078 index 195b1533ab69..c805597744bd 100644
3079 --- a/tools/ifdtool.c
3080 +++ b/tools/ifdtool.c
3081 @@ -18,7 +18,7 @@
3082 #include <unistd.h>
3083 #include <sys/types.h>
3084 #include <sys/stat.h>
3085 -#include <libfdt.h>
3086 +#include <linux/libfdt.h>
3087 #include "ifdtool.h"
3088
3089 #undef DEBUG
3090 --
3091 2.21.0
3092
OpenWrt Source Repository