Move sys/boot/fdt/dts to sys/dts and adjust scripts.

Sponsored by: Netflix

118 files changed, 3 insertions, 3 deletions

diff --git a/sys/conf/dtb.mk b/sys/conf/dtb.mk
index f3e2fa7435ef..96947171b05f 100644
--- a/sys/conf/dtb.mk
+++ b/sys/conf/dtb.mk
@@ -47,7 +47,7 @@ SYSDIR=	${_dir:tA}
 
 .SUFFIXES: .dtb .dts
 
-.PATH: ${SYSDIR}/gnu/dts/${MACHINE} ${SYSDIR}/boot/fdt/dts/${MACHINE}
+.PATH: ${SYSDIR}/gnu/dts/${MACHINE} ${SYSDIR}/dts/${MACHINE}
 
 DTB=${DTS:R:S/$/.dtb/}
 
diff --git a/sys/boot/fdt/dts/Makefile b/sys/dts/Makefile
index 9025c04ba4a6..9025c04ba4a6 100644
--- a/sys/boot/fdt/dts/Makefile
+++ b/sys/dts/Makefile
diff --git a/sys/boot/fdt/dts/Makefile.inc b/sys/dts/Makefile.inc
index 4454755dc813..4454755dc813 100644
--- a/sys/boot/fdt/dts/Makefile.inc
+++ b/sys/dts/Makefile.inc
diff --git a/sys/boot/fdt/dts/arm/Makefile b/sys/dts/arm/Makefile
index 03d156d94770..03d156d94770 100644
--- a/sys/boot/fdt/dts/arm/Makefile
+++ b/sys/dts/arm/Makefile
diff --git a/sys/boot/fdt/dts/arm/a83t.dtsi b/sys/dts/arm/a83t.dtsi
index 1a31987e6718..1a31987e6718 100644
--- a/sys/boot/fdt/dts/arm/a83t.dtsi
+++ b/sys/dts/arm/a83t.dtsi
diff --git a/sys/boot/fdt/dts/arm/annapurna-alpine.dts b/sys/dts/arm/annapurna-alpine.dts
index 0bca6059501f..0bca6059501f 100644
--- a/sys/boot/fdt/dts/arm/annapurna-alpine.dts
+++ b/sys/dts/arm/annapurna-alpine.dts
diff --git a/sys/boot/fdt/dts/arm/apalis-imx6.dts b/sys/dts/arm/apalis-imx6.dts
index b6440603c583..b6440603c583 100644
--- a/sys/boot/fdt/dts/arm/apalis-imx6.dts
+++ b/sys/dts/arm/apalis-imx6.dts
diff --git a/sys/boot/fdt/dts/arm/armada-380.dtsi b/sys/dts/arm/armada-380.dtsi
index 20a236a8d9a9..20a236a8d9a9 100644
--- a/sys/boot/fdt/dts/arm/armada-380.dtsi
+++ b/sys/dts/arm/armada-380.dtsi
diff --git a/sys/boot/fdt/dts/arm/armada-385-db-ap.dts b/sys/dts/arm/armada-385-db-ap.dts
index 77bd350ca479..77bd350ca479 100644
--- a/sys/boot/fdt/dts/arm/armada-385-db-ap.dts
+++ b/sys/dts/arm/armada-385-db-ap.dts
diff --git a/sys/boot/fdt/dts/arm/armada-385.dtsi b/sys/dts/arm/armada-385.dtsi
index b29cd06fefec..b29cd06fefec 100644
--- a/sys/boot/fdt/dts/arm/armada-385.dtsi
+++ b/sys/dts/arm/armada-385.dtsi
diff --git a/sys/boot/fdt/dts/arm/armada-388-clearfog.dts b/sys/dts/arm/armada-388-clearfog.dts
index 78c8007162a8..78c8007162a8 100644
--- a/sys/boot/fdt/dts/arm/armada-388-clearfog.dts
+++ b/sys/dts/arm/armada-388-clearfog.dts
diff --git a/sys/boot/fdt/dts/arm/armada-388-gp.dts b/sys/dts/arm/armada-388-gp.dts
index 207924761039..207924761039 100644
--- a/sys/boot/fdt/dts/arm/armada-388-gp.dts
+++ b/sys/dts/arm/armada-388-gp.dts
diff --git a/sys/boot/fdt/dts/arm/armada-388.dtsi b/sys/dts/arm/armada-388.dtsi
index 7be5f78478ef..7be5f78478ef 100644
--- a/sys/boot/fdt/dts/arm/armada-388.dtsi
+++ b/sys/dts/arm/armada-388.dtsi
diff --git a/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi b/sys/dts/arm/armada-38x-solidrun-microsom.dtsi
index 2595eaeefdea..2595eaeefdea 100644
--- a/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi
+++ b/sys/dts/arm/armada-38x-solidrun-microsom.dtsi
diff --git a/sys/boot/fdt/dts/arm/armada-38x.dtsi b/sys/dts/arm/armada-38x.dtsi
index 8f0789920084..8f0789920084 100644
--- a/sys/boot/fdt/dts/arm/armada-38x.dtsi
+++ b/sys/dts/arm/armada-38x.dtsi
diff --git a/sys/boot/fdt/dts/arm/bcm2835.dtsi b/sys/dts/arm/bcm2835.dtsi
index 52b6315d6125..52b6315d6125 100644
--- a/sys/boot/fdt/dts/arm/bcm2835.dtsi
+++ b/sys/dts/arm/bcm2835.dtsi
diff --git a/sys/boot/fdt/dts/arm/bcm2836.dtsi b/sys/dts/arm/bcm2836.dtsi
index 3ade53c28f4c..3ade53c28f4c 100644
--- a/sys/boot/fdt/dts/arm/bcm2836.dtsi
+++ b/sys/dts/arm/bcm2836.dtsi
diff --git a/sys/boot/fdt/dts/arm/db78100.dts b/sys/dts/arm/db78100.dts
index d890db069c15..d890db069c15 100644
--- a/sys/boot/fdt/dts/arm/db78100.dts
+++ b/sys/dts/arm/db78100.dts
diff --git a/sys/boot/fdt/dts/arm/db78460.dts b/sys/dts/arm/db78460.dts
index 9b4d08fddd15..9b4d08fddd15 100644
--- a/sys/boot/fdt/dts/arm/db78460.dts
+++ b/sys/dts/arm/db78460.dts
diff --git a/sys/boot/fdt/dts/arm/db88f5182.dts b/sys/dts/arm/db88f5182.dts
index 6ce7b6580d36..6ce7b6580d36 100644
--- a/sys/boot/fdt/dts/arm/db88f5182.dts
+++ b/sys/dts/arm/db88f5182.dts
diff --git a/sys/boot/fdt/dts/arm/db88f5281.dts b/sys/dts/arm/db88f5281.dts
index 61212eb4db1f..61212eb4db1f 100644
--- a/sys/boot/fdt/dts/arm/db88f5281.dts
+++ b/sys/dts/arm/db88f5281.dts
diff --git a/sys/boot/fdt/dts/arm/db88f6281.dts b/sys/dts/arm/db88f6281.dts
index f50eb655da1f..f50eb655da1f 100644
--- a/sys/boot/fdt/dts/arm/db88f6281.dts
+++ b/sys/dts/arm/db88f6281.dts
diff --git a/sys/boot/fdt/dts/arm/digi-ccwmx53.dts b/sys/dts/arm/digi-ccwmx53.dts
index f101c5a27da8..f101c5a27da8 100644
--- a/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
+++ b/sys/dts/arm/digi-ccwmx53.dts
diff --git a/sys/boot/fdt/dts/arm/dockstar.dts b/sys/dts/arm/dockstar.dts
index b80534265eba..b80534265eba 100644
--- a/sys/boot/fdt/dts/arm/dockstar.dts
+++ b/sys/dts/arm/dockstar.dts
diff --git a/sys/boot/fdt/dts/arm/dreamplug-1001.dts b/sys/dts/arm/dreamplug-1001.dts
index 7b3998d02d5b..7b3998d02d5b 100644
--- a/sys/boot/fdt/dts/arm/dreamplug-1001.dts
+++ b/sys/dts/arm/dreamplug-1001.dts
diff --git a/sys/boot/fdt/dts/arm/dreamplug-1001N.dts b/sys/dts/arm/dreamplug-1001N.dts
index d233bcadbc54..d233bcadbc54 100644
--- a/sys/boot/fdt/dts/arm/dreamplug-1001N.dts
+++ b/sys/dts/arm/dreamplug-1001N.dts
diff --git a/sys/boot/fdt/dts/arm/ea3250.dts b/sys/dts/arm/ea3250.dts
index 2c466e363745..2c466e363745 100644
--- a/sys/boot/fdt/dts/arm/ea3250.dts
+++ b/sys/dts/arm/ea3250.dts
diff --git a/sys/boot/fdt/dts/arm/efikamx.dts b/sys/dts/arm/efikamx.dts
index e077fb78ad0f..e077fb78ad0f 100644
--- a/sys/boot/fdt/dts/arm/efikamx.dts
+++ b/sys/dts/arm/efikamx.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5.dtsi b/sys/dts/arm/exynos5.dtsi
index 87d8fdb019f2..87d8fdb019f2 100644
--- a/sys/boot/fdt/dts/arm/exynos5.dtsi
+++ b/sys/dts/arm/exynos5.dtsi
diff --git a/sys/boot/fdt/dts/arm/exynos5250-arndale.dts b/sys/dts/arm/exynos5250-arndale.dts
index 81d1817fc833..81d1817fc833 100644
--- a/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
+++ b/sys/dts/arm/exynos5250-arndale.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5250-snow.dts b/sys/dts/arm/exynos5250-snow.dts
index cb40ec5b0b6a..cb40ec5b0b6a 100644
--- a/sys/boot/fdt/dts/arm/exynos5250-snow.dts
+++ b/sys/dts/arm/exynos5250-snow.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5250-spring.dts b/sys/dts/arm/exynos5250-spring.dts
index c0e428580695..c0e428580695 100644
--- a/sys/boot/fdt/dts/arm/exynos5250-spring.dts
+++ b/sys/dts/arm/exynos5250-spring.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5250.dtsi b/sys/dts/arm/exynos5250.dtsi
index a8f74f498bdb..a8f74f498bdb 100644
--- a/sys/boot/fdt/dts/arm/exynos5250.dtsi
+++ b/sys/dts/arm/exynos5250.dtsi
diff --git a/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts b/sys/dts/arm/exynos5420-arndale-octa.dts
index 8f090651c3e6..8f090651c3e6 100644
--- a/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
+++ b/sys/dts/arm/exynos5420-arndale-octa.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts b/sys/dts/arm/exynos5420-peach-pit.dts
index 80aca895d768..80aca895d768 100644
--- a/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
+++ b/sys/dts/arm/exynos5420-peach-pit.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5420.dtsi b/sys/dts/arm/exynos5420.dtsi
index 38a5a887949f..38a5a887949f 100644
--- a/sys/boot/fdt/dts/arm/exynos5420.dtsi
+++ b/sys/dts/arm/exynos5420.dtsi
diff --git a/sys/boot/fdt/dts/arm/h3.dtsi b/sys/dts/arm/h3.dtsi
index 078b802c0669..078b802c0669 100644
--- a/sys/boot/fdt/dts/arm/h3.dtsi
+++ b/sys/dts/arm/h3.dtsi
diff --git a/sys/boot/fdt/dts/arm/hl201.dts b/sys/dts/arm/hl201.dts
index 1566b30f8f96..1566b30f8f96 100644
--- a/sys/boot/fdt/dts/arm/hl201.dts
+++ b/sys/dts/arm/hl201.dts
diff --git a/sys/boot/fdt/dts/arm/imx51x.dtsi b/sys/dts/arm/imx51x.dtsi
index cc06f0f355ec..cc06f0f355ec 100644
--- a/sys/boot/fdt/dts/arm/imx51x.dtsi
+++ b/sys/dts/arm/imx51x.dtsi
diff --git a/sys/boot/fdt/dts/arm/imx53x.dtsi b/sys/dts/arm/imx53x.dtsi
index c6a696ede794..c6a696ede794 100644
--- a/sys/boot/fdt/dts/arm/imx53x.dtsi
+++ b/sys/dts/arm/imx53x.dtsi
diff --git a/sys/boot/fdt/dts/arm/imx6.dtsi b/sys/dts/arm/imx6.dtsi
index db8b44e53b26..db8b44e53b26 100644
--- a/sys/boot/fdt/dts/arm/imx6.dtsi
+++ b/sys/dts/arm/imx6.dtsi
diff --git a/sys/boot/fdt/dts/arm/meson3.dtsi b/sys/dts/arm/meson3.dtsi
index 444e3cf62e9e..444e3cf62e9e 100644
--- a/sys/boot/fdt/dts/arm/meson3.dtsi
+++ b/sys/dts/arm/meson3.dtsi
diff --git a/sys/boot/fdt/dts/arm/meson8b.dtsi b/sys/dts/arm/meson8b.dtsi
index c76a01a4fa35..c76a01a4fa35 100644
--- a/sys/boot/fdt/dts/arm/meson8b.dtsi
+++ b/sys/dts/arm/meson8b.dtsi
diff --git a/sys/boot/fdt/dts/arm/nanopi-neo.dts b/sys/dts/arm/nanopi-neo.dts
index d227209ade6b..d227209ade6b 100644
--- a/sys/boot/fdt/dts/arm/nanopi-neo.dts
+++ b/sys/dts/arm/nanopi-neo.dts
diff --git a/sys/boot/fdt/dts/arm/odroidc1.dts b/sys/dts/arm/odroidc1.dts
index 2d15a0900e06..2d15a0900e06 100644
--- a/sys/boot/fdt/dts/arm/odroidc1.dts
+++ b/sys/dts/arm/odroidc1.dts
diff --git a/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts b/sys/dts/arm/orangepi-plus-2e.dts
index 28298cac50e5..28298cac50e5 100644
--- a/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts
+++ b/sys/dts/arm/orangepi-plus-2e.dts
diff --git a/sys/boot/fdt/dts/arm/pandaboard-common.dtsi b/sys/dts/arm/pandaboard-common.dtsi
index f8d2a0814b8c..f8d2a0814b8c 100644
--- a/sys/boot/fdt/dts/arm/pandaboard-common.dtsi
+++ b/sys/dts/arm/pandaboard-common.dtsi
diff --git a/sys/boot/fdt/dts/arm/pandaboard-es.dts b/sys/dts/arm/pandaboard-es.dts
index 6c3f4b58e4ac..6c3f4b58e4ac 100644
--- a/sys/boot/fdt/dts/arm/pandaboard-es.dts
+++ b/sys/dts/arm/pandaboard-es.dts
diff --git a/sys/boot/fdt/dts/arm/pandaboard.dts b/sys/dts/arm/pandaboard.dts
index b25ca634e202..b25ca634e202 100644
--- a/sys/boot/fdt/dts/arm/pandaboard.dts
+++ b/sys/dts/arm/pandaboard.dts
diff --git a/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts b/sys/dts/arm/rk3188-radxa-lite.dts
index 643f5d0ea826..643f5d0ea826 100644
--- a/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
+++ b/sys/dts/arm/rk3188-radxa-lite.dts
diff --git a/sys/boot/fdt/dts/arm/rk3188-radxa.dts b/sys/dts/arm/rk3188-radxa.dts
index c3740a0a5a4d..c3740a0a5a4d 100644
--- a/sys/boot/fdt/dts/arm/rk3188-radxa.dts
+++ b/sys/dts/arm/rk3188-radxa.dts
diff --git a/sys/boot/fdt/dts/arm/rk3188.dtsi b/sys/dts/arm/rk3188.dtsi
index 66284aa184c2..66284aa184c2 100644
--- a/sys/boot/fdt/dts/arm/rk3188.dtsi
+++ b/sys/dts/arm/rk3188.dtsi
diff --git a/sys/boot/fdt/dts/arm/rpi.dts b/sys/dts/arm/rpi.dts
index b3eef3a42bca..b3eef3a42bca 100644
--- a/sys/boot/fdt/dts/arm/rpi.dts
+++ b/sys/dts/arm/rpi.dts
diff --git a/sys/boot/fdt/dts/arm/rpi2.dts b/sys/dts/arm/rpi2.dts
index 2a5c9e97cdd3..2a5c9e97cdd3 100644
--- a/sys/boot/fdt/dts/arm/rpi2.dts
+++ b/sys/dts/arm/rpi2.dts
diff --git a/sys/boot/fdt/dts/arm/rt1310a.dtsi b/sys/dts/arm/rt1310a.dtsi
index 6fc916b64d16..6fc916b64d16 100644
--- a/sys/boot/fdt/dts/arm/rt1310a.dtsi
+++ b/sys/dts/arm/rt1310a.dtsi
diff --git a/sys/boot/fdt/dts/arm/sam9260ek.dts b/sys/dts/arm/sam9260ek.dts
index 8e4d7530ea1a..8e4d7530ea1a 100644
--- a/sys/boot/fdt/dts/arm/sam9260ek.dts
+++ b/sys/dts/arm/sam9260ek.dts
diff --git a/sys/boot/fdt/dts/arm/sheevaplug.dts b/sys/dts/arm/sheevaplug.dts
index fb0270a3a1db..fb0270a3a1db 100644
--- a/sys/boot/fdt/dts/arm/sheevaplug.dts
+++ b/sys/dts/arm/sheevaplug.dts
diff --git a/sys/boot/fdt/dts/arm/sinovoip-bpi-m3.dts b/sys/dts/arm/sinovoip-bpi-m3.dts
index b88ef52ff22d..b88ef52ff22d 100644
--- a/sys/boot/fdt/dts/arm/sinovoip-bpi-m3.dts
+++ b/sys/dts/arm/sinovoip-bpi-m3.dts
diff --git a/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts b/sys/dts/arm/socfpga_arria10_socdk_sdmmc.dts
index 7659b7c8034c..7659b7c8034c 100644
--- a/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts
+++ b/sys/dts/arm/socfpga_arria10_socdk_sdmmc.dts
diff --git a/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts b/sys/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts
index 435fd6509a50..435fd6509a50 100644
--- a/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts
+++ b/sys/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts
diff --git a/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts b/sys/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts
index 602e87b2d77c..602e87b2d77c 100644
--- a/sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts
+++ b/sys/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts
diff --git a/sys/boot/fdt/dts/arm/sun7i-a20-hdmi.dtsi b/sys/dts/arm/sun7i-a20-hdmi.dtsi
index c83d6a2c1d99..c83d6a2c1d99 100644
--- a/sys/boot/fdt/dts/arm/sun7i-a20-hdmi.dtsi
+++ b/sys/dts/arm/sun7i-a20-hdmi.dtsi
diff --git a/sys/boot/fdt/dts/arm/sun8i-a83t-sinovoip-bpi-m3.dts b/sys/dts/arm/sun8i-a83t-sinovoip-bpi-m3.dts
index f019bfca4ea8..f019bfca4ea8 100644
--- a/sys/boot/fdt/dts/arm/sun8i-a83t-sinovoip-bpi-m3.dts
+++ b/sys/dts/arm/sun8i-a83t-sinovoip-bpi-m3.dts
diff --git a/sys/boot/fdt/dts/arm/sun8i-a83t.dtsi b/sys/dts/arm/sun8i-a83t.dtsi
index 4e421423236e..4e421423236e 100644
--- a/sys/boot/fdt/dts/arm/sun8i-a83t.dtsi
+++ b/sys/dts/arm/sun8i-a83t.dtsi
diff --git a/sys/boot/fdt/dts/arm/sun8i-h3-nanopi-neo.dts b/sys/dts/arm/sun8i-h3-nanopi-neo.dts
index 7ea454faae8c..7ea454faae8c 100644
--- a/sys/boot/fdt/dts/arm/sun8i-h3-nanopi-neo.dts
+++ b/sys/dts/arm/sun8i-h3-nanopi-neo.dts
diff --git a/sys/boot/fdt/dts/arm/tegra124-jetson-tk1-fbsd.dts b/sys/dts/arm/tegra124-jetson-tk1-fbsd.dts
index beed05d9b971..beed05d9b971 100644
--- a/sys/boot/fdt/dts/arm/tegra124-jetson-tk1-fbsd.dts
+++ b/sys/dts/arm/tegra124-jetson-tk1-fbsd.dts
diff --git a/sys/boot/fdt/dts/arm/tegra20-paz00.dts b/sys/dts/arm/tegra20-paz00.dts
index 912a8f9c631d..912a8f9c631d 100644
--- a/sys/boot/fdt/dts/arm/tegra20-paz00.dts
+++ b/sys/dts/arm/tegra20-paz00.dts
diff --git a/sys/boot/fdt/dts/arm/tegra20.dtsi b/sys/dts/arm/tegra20.dtsi
index d7107fdc3164..d7107fdc3164 100644
--- a/sys/boot/fdt/dts/arm/tegra20.dtsi
+++ b/sys/dts/arm/tegra20.dtsi
diff --git a/sys/boot/fdt/dts/arm/trimslice.dts b/sys/dts/arm/trimslice.dts
index ac7017fc59fa..ac7017fc59fa 100644
--- a/sys/boot/fdt/dts/arm/trimslice.dts
+++ b/sys/dts/arm/trimslice.dts
diff --git a/sys/boot/fdt/dts/arm/ts7800.dts b/sys/dts/arm/ts7800.dts
index 547a2d755115..547a2d755115 100644
--- a/sys/boot/fdt/dts/arm/ts7800.dts
+++ b/sys/dts/arm/ts7800.dts
diff --git a/sys/boot/fdt/dts/arm/ufw.dts b/sys/dts/arm/ufw.dts
index 8b731a1a9d29..8b731a1a9d29 100644
--- a/sys/boot/fdt/dts/arm/ufw.dts
+++ b/sys/dts/arm/ufw.dts
diff --git a/sys/boot/fdt/dts/arm/versatilepb.dts b/sys/dts/arm/versatilepb.dts
index ca58e8859c09..ca58e8859c09 100644
--- a/sys/boot/fdt/dts/arm/versatilepb.dts
+++ b/sys/dts/arm/versatilepb.dts
diff --git a/sys/boot/fdt/dts/arm/vsatv102-m6.dts b/sys/dts/arm/vsatv102-m6.dts
index 468d5f0096d5..468d5f0096d5 100644
--- a/sys/boot/fdt/dts/arm/vsatv102-m6.dts
+++ b/sys/dts/arm/vsatv102-m6.dts
diff --git a/sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts b/sys/dts/arm/vybrid-colibri-vf50.dts
index 6d4d934b3d3f..6d4d934b3d3f 100644
--- a/sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts
+++ b/sys/dts/arm/vybrid-colibri-vf50.dts
diff --git a/sys/boot/fdt/dts/arm/vybrid-cosmic.dts b/sys/dts/arm/vybrid-cosmic.dts
index c98c093257fa..c98c093257fa 100644
--- a/sys/boot/fdt/dts/arm/vybrid-cosmic.dts
+++ b/sys/dts/arm/vybrid-cosmic.dts
diff --git a/sys/boot/fdt/dts/arm/vybrid-quartz.dts b/sys/dts/arm/vybrid-quartz.dts
index 48cc1b5f90e0..48cc1b5f90e0 100644
--- a/sys/boot/fdt/dts/arm/vybrid-quartz.dts
+++ b/sys/dts/arm/vybrid-quartz.dts
diff --git a/sys/boot/fdt/dts/arm/vybrid.dtsi b/sys/dts/arm/vybrid.dtsi
index 1386c70f4b09..1386c70f4b09 100644
--- a/sys/boot/fdt/dts/arm/vybrid.dtsi
+++ b/sys/dts/arm/vybrid.dtsi
diff --git a/sys/boot/fdt/dts/arm/wandboard-dual.dts b/sys/dts/arm/wandboard-dual.dts
index 89c9d30827a6..89c9d30827a6 100644
--- a/sys/boot/fdt/dts/arm/wandboard-dual.dts
+++ b/sys/dts/arm/wandboard-dual.dts
diff --git a/sys/boot/fdt/dts/arm/wandboard-quad.dts b/sys/dts/arm/wandboard-quad.dts
index fd7b9b41ede7..fd7b9b41ede7 100644
--- a/sys/boot/fdt/dts/arm/wandboard-quad.dts
+++ b/sys/dts/arm/wandboard-quad.dts
diff --git a/sys/boot/fdt/dts/arm/wandboard-solo.dts b/sys/dts/arm/wandboard-solo.dts
index 5d67f2b8b9b8..5d67f2b8b9b8 100644
--- a/sys/boot/fdt/dts/arm/wandboard-solo.dts
+++ b/sys/dts/arm/wandboard-solo.dts
diff --git a/sys/boot/fdt/dts/arm/wzr2-g300n.dts b/sys/dts/arm/wzr2-g300n.dts
index e6b8159ec837..e6b8159ec837 100644
--- a/sys/boot/fdt/dts/arm/wzr2-g300n.dts
+++ b/sys/dts/arm/wzr2-g300n.dts
diff --git a/sys/boot/fdt/dts/arm/xpowers-axp209.dtsi b/sys/dts/arm/xpowers-axp209.dtsi
index 566e61d12ced..566e61d12ced 100644
--- a/sys/boot/fdt/dts/arm/xpowers-axp209.dtsi
+++ b/sys/dts/arm/xpowers-axp209.dtsi
diff --git a/sys/boot/fdt/dts/arm/yyhd18-m3.dts b/sys/dts/arm/yyhd18-m3.dts
index bdb425d034c0..bdb425d034c0 100644
--- a/sys/boot/fdt/dts/arm/yyhd18-m3.dts
+++ b/sys/dts/arm/yyhd18-m3.dts
diff --git a/sys/boot/fdt/dts/arm/zedboard.dts b/sys/dts/arm/zedboard.dts
index d17fd0eb6ea5..d17fd0eb6ea5 100644
--- a/sys/boot/fdt/dts/arm/zedboard.dts
+++ b/sys/dts/arm/zedboard.dts
diff --git a/sys/boot/fdt/dts/arm/zybo.dts b/sys/dts/arm/zybo.dts
index 2364d80d5be9..2364d80d5be9 100644
--- a/sys/boot/fdt/dts/arm/zybo.dts
+++ b/sys/dts/arm/zybo.dts
diff --git a/sys/boot/fdt/dts/arm/zynq-7000.dtsi b/sys/dts/arm/zynq-7000.dtsi
index ae081ad098e2..ae081ad098e2 100644
--- a/sys/boot/fdt/dts/arm/zynq-7000.dtsi
+++ b/sys/dts/arm/zynq-7000.dtsi
diff --git a/sys/boot/fdt/dts/arm64/Makefile b/sys/dts/arm64/Makefile
index 03d156d94770..03d156d94770 100644
--- a/sys/boot/fdt/dts/arm64/Makefile
+++ b/sys/dts/arm64/Makefile
diff --git a/sys/boot/fdt/dts/arm64/a64.dtsi b/sys/dts/arm64/a64.dtsi
index 5cf1d38c235f..5cf1d38c235f 100644
--- a/sys/boot/fdt/dts/arm64/a64.dtsi
+++ b/sys/dts/arm64/a64.dtsi
diff --git a/sys/boot/fdt/dts/arm64/pine64_plus.dts b/sys/dts/arm64/pine64_plus.dts
index 5182c23b7ee1..5182c23b7ee1 100644
--- a/sys/boot/fdt/dts/arm64/pine64_plus.dts
+++ b/sys/dts/arm64/pine64_plus.dts
diff --git a/sys/boot/fdt/dts/arm64/sun50i-a64-pine64-common.dtsi b/sys/dts/arm64/sun50i-a64-pine64-common.dtsi
index d4de80aedcba..d4de80aedcba 100644
--- a/sys/boot/fdt/dts/arm64/sun50i-a64-pine64-common.dtsi
+++ b/sys/dts/arm64/sun50i-a64-pine64-common.dtsi
diff --git a/sys/boot/fdt/dts/arm64/sun50i-a64-pine64-plus.dts b/sys/dts/arm64/sun50i-a64-pine64-plus.dts
index 1b9eefaa4757..1b9eefaa4757 100644
--- a/sys/boot/fdt/dts/arm64/sun50i-a64-pine64-plus.dts
+++ b/sys/dts/arm64/sun50i-a64-pine64-plus.dts
diff --git a/sys/boot/fdt/dts/arm64/sun50i-a64-pine64.dts b/sys/dts/arm64/sun50i-a64-pine64.dts
index 4ec68bcf593c..4ec68bcf593c 100644
--- a/sys/boot/fdt/dts/arm64/sun50i-a64-pine64.dts
+++ b/sys/dts/arm64/sun50i-a64-pine64.dts
diff --git a/sys/boot/fdt/dts/arm64/sun50i-a64.dtsi b/sys/dts/arm64/sun50i-a64.dtsi
index fe187575e5ac..fe187575e5ac 100644
--- a/sys/boot/fdt/dts/arm64/sun50i-a64.dtsi
+++ b/sys/dts/arm64/sun50i-a64.dtsi
diff --git a/sys/boot/fdt/dts/bindings-gpio.txt b/sys/dts/bindings-gpio.txt
index b13078aeb0b3..b13078aeb0b3 100644
--- a/sys/boot/fdt/dts/bindings-gpio.txt
+++ b/sys/dts/bindings-gpio.txt
diff --git a/sys/boot/fdt/dts/bindings-localbus.txt b/sys/dts/bindings-localbus.txt
index d960fefcf75d..d960fefcf75d 100644
--- a/sys/boot/fdt/dts/bindings-localbus.txt
+++ b/sys/dts/bindings-localbus.txt
diff --git a/sys/boot/fdt/dts/bindings-mpp.txt b/sys/dts/bindings-mpp.txt
index 5da776e43cfc..5da776e43cfc 100644
--- a/sys/boot/fdt/dts/bindings-mpp.txt
+++ b/sys/dts/bindings-mpp.txt
diff --git a/sys/boot/fdt/dts/mips/Makefile b/sys/dts/mips/Makefile
index 03d156d94770..03d156d94770 100644
--- a/sys/boot/fdt/dts/mips/Makefile
+++ b/sys/dts/mips/Makefile
diff --git a/sys/boot/fdt/dts/mips/beri-netfpga.dts b/sys/dts/mips/beri-netfpga.dts
index 205b7eea86e4..205b7eea86e4 100644
--- a/sys/boot/fdt/dts/mips/beri-netfpga.dts
+++ b/sys/dts/mips/beri-netfpga.dts
diff --git a/sys/boot/fdt/dts/mips/beri-sim.dts b/sys/dts/mips/beri-sim.dts
index 8f116e4327ac..8f116e4327ac 100644
--- a/sys/boot/fdt/dts/mips/beri-sim.dts
+++ b/sys/dts/mips/beri-sim.dts
diff --git a/sys/boot/fdt/dts/mips/beripad-de4.dts b/sys/dts/mips/beripad-de4.dts
index 89882833890d..89882833890d 100644
--- a/sys/boot/fdt/dts/mips/beripad-de4.dts
+++ b/sys/dts/mips/beripad-de4.dts
diff --git a/sys/boot/fdt/dts/mips/beripad-sockit.dts b/sys/dts/mips/beripad-sockit.dts
index fe096cc4e42a..fe096cc4e42a 100644
--- a/sys/boot/fdt/dts/mips/beripad-sockit.dts
+++ b/sys/dts/mips/beripad-sockit.dts
diff --git a/sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi b/sys/dts/mips/fbsd-mt7620a.dtsi
index e88117b9e1f4..e88117b9e1f4 100644
--- a/sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi
+++ b/sys/dts/mips/fbsd-mt7620a.dtsi
diff --git a/sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi b/sys/dts/mips/fbsd-mt7621.dtsi
index eee36b2a0e36..eee36b2a0e36 100644
--- a/sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi
+++ b/sys/dts/mips/fbsd-mt7621.dtsi
diff --git a/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi b/sys/dts/mips/fbsd-mt7628an.dtsi
index e64887976cf2..e64887976cf2 100644
--- a/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi
+++ b/sys/dts/mips/fbsd-mt7628an.dtsi
diff --git a/sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi b/sys/dts/mips/fbsd-rt3883.dtsi
index f71c29eb8248..f71c29eb8248 100644
--- a/sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi
+++ b/sys/dts/mips/fbsd-rt3883.dtsi
diff --git a/sys/boot/fdt/dts/mips/xlp-basic.dts b/sys/dts/mips/xlp-basic.dts
index 19f08017686c..19f08017686c 100644
--- a/sys/boot/fdt/dts/mips/xlp-basic.dts
+++ b/sys/dts/mips/xlp-basic.dts
diff --git a/sys/boot/fdt/dts/powerpc/Makefile b/sys/dts/powerpc/Makefile
index 03d156d94770..03d156d94770 100644
--- a/sys/boot/fdt/dts/powerpc/Makefile
+++ b/sys/dts/powerpc/Makefile
diff --git a/sys/boot/fdt/dts/powerpc/mpc8555cds.dts b/sys/dts/powerpc/mpc8555cds.dts
index 34991baaefde..34991baaefde 100644
--- a/sys/boot/fdt/dts/powerpc/mpc8555cds.dts
+++ b/sys/dts/powerpc/mpc8555cds.dts
diff --git a/sys/boot/fdt/dts/powerpc/mpc8572ds.dts b/sys/dts/powerpc/mpc8572ds.dts
index 67f0d66f8680..67f0d66f8680 100644
--- a/sys/boot/fdt/dts/powerpc/mpc8572ds.dts
+++ b/sys/dts/powerpc/mpc8572ds.dts
diff --git a/sys/boot/fdt/dts/powerpc/p1020rdb.dts b/sys/dts/powerpc/p1020rdb.dts
index ec5118ce0f3f..ec5118ce0f3f 100644
--- a/sys/boot/fdt/dts/powerpc/p1020rdb.dts
+++ b/sys/dts/powerpc/p1020rdb.dts
diff --git a/sys/boot/fdt/dts/powerpc/p2020ds.dts b/sys/dts/powerpc/p2020ds.dts
index 7823429dc9d1..7823429dc9d1 100644
--- a/sys/boot/fdt/dts/powerpc/p2020ds.dts
+++ b/sys/dts/powerpc/p2020ds.dts
diff --git a/sys/boot/fdt/dts/powerpc/p2041rdb.dts b/sys/dts/powerpc/p2041rdb.dts
index 3ce2e60096cc..3ce2e60096cc 100644
--- a/sys/boot/fdt/dts/powerpc/p2041rdb.dts
+++ b/sys/dts/powerpc/p2041rdb.dts
diff --git a/sys/boot/fdt/dts/powerpc/p2041si.dtsi b/sys/dts/powerpc/p2041si.dtsi
index 41eb1dd74523..41eb1dd74523 100644
--- a/sys/boot/fdt/dts/powerpc/p2041si.dtsi
+++ b/sys/dts/powerpc/p2041si.dtsi
diff --git a/sys/boot/fdt/dts/powerpc/p3041ds.dts b/sys/dts/powerpc/p3041ds.dts
index bcc9ff3112b5..bcc9ff3112b5 100644
--- a/sys/boot/fdt/dts/powerpc/p3041ds.dts
+++ b/sys/dts/powerpc/p3041ds.dts
diff --git a/sys/boot/fdt/dts/powerpc/p3041si.dtsi b/sys/dts/powerpc/p3041si.dtsi
index 368cd6272bfb..368cd6272bfb 100644
--- a/sys/boot/fdt/dts/powerpc/p3041si.dtsi
+++ b/sys/dts/powerpc/p3041si.dtsi
diff --git a/sys/boot/fdt/dts/powerpc/p5020ds.dts b/sys/dts/powerpc/p5020ds.dts
index 3e0d92fbd83e..3e0d92fbd83e 100644
--- a/sys/boot/fdt/dts/powerpc/p5020ds.dts
+++ b/sys/dts/powerpc/p5020ds.dts
diff --git a/sys/boot/fdt/dts/powerpc/p5020si.dtsi b/sys/dts/powerpc/p5020si.dtsi
index afed942a2b96..afed942a2b96 100644
--- a/sys/boot/fdt/dts/powerpc/p5020si.dtsi
+++ b/sys/dts/powerpc/p5020si.dtsi
diff --git a/sys/tools/fdt/make_dtb.sh b/sys/tools/fdt/make_dtb.sh
index f2becbe6218d..1efd4d1732a1 100755
--- a/sys/tools/fdt/make_dtb.sh
+++ b/sys/tools/fdt/make_dtb.sh
@@ -21,6 +21,6 @@ fi
 for d in ${dts}; do
     dtb=${dtb_path}/`basename $d .dts`.dtb
     echo "converting $d -> $dtb"
-    cpp -P -x assembler-with-cpp -I $S/gnu/dts/include -I $S/boot/fdt/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $d /dev/null | 
-	${DTC} -@ -O dtb -o $dtb -b 0 -p 1024 -i $S/boot/fdt/dts/${MACHINE} -i $S/gnu/dts/${MACHINE}
+    cpp -P -x assembler-with-cpp -I $S/gnu/dts/include -I $S/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $d /dev/null | 
+	${DTC} -@ -O dtb -o $dtb -b 0 -p 1024 -i $S/dts/${MACHINE} -i $S/gnu/dts/${MACHINE}
 done