diff --git a/share/man/man4/fdt.4 b/share/man/man4/fdt.4
index 6b371a50e1a8..dc08be39c234 100644
--- a/share/man/man4/fdt.4
+++ b/share/man/man4/fdt.4
@@ -95,7 +95,7 @@ computer system in a human-readable form, with certain hierarchical structure
 The default location for DTS files in the
 .Fx
 source repository is
-.Pa sys/boot/fdt/dts
+.Pa sys/dts
 directory.
 .It Va Device tree blob (DTB)
 The textual device tree description (DTS file) is first converted (compiled)
@@ -156,7 +156,7 @@ kernel.
 The indicated DTS file will be converted (compiled) into a binary form
 along with building the kernel itself.
 The DTS file name is relative to the default location of DTS sources i.e.
-.Pa sys/boot/fdt/dts .
+.Pa sys/dts .
 This makeoption is not mandatory unless FDT_DTB_STATIC is also defined (see
 below).
 .It Va options FDT_DTB_STATIC
diff --git a/share/man/man4/gpioiic.4 b/share/man/man4/gpioiic.4
index 2a9c8efee54e..ff3b9210eb3f 100644
--- a/share/man/man4/gpioiic.4
+++ b/share/man/man4/gpioiic.4
@@ -137,7 +137,7 @@ on the GPIO IIC bit-banging bus.
 For more details about the
 .Va gpios
 property, please consult
-.Pa /usr/src/sys/boot/fdt/dts/bindings-gpio.txt .
+.Pa /usr/src/sys/dts/bindings-gpio.txt .
 .It Va scl
 The
 .Va scl
diff --git a/share/man/man4/gpioled.4 b/share/man/man4/gpioled.4
index 3fb4c4d64e9d..b5a313919b33 100644
--- a/share/man/man4/gpioled.4
+++ b/share/man/man4/gpioled.4
@@ -134,7 +134,7 @@ The only restriction is that a GPIO pin cannot be mapped by two different
 For more details about the
 .Va gpios
 property, please consult
-.Pa /usr/src/sys/boot/fdt/dts/bindings-gpio.txt .
+.Pa /usr/src/sys/dts/bindings-gpio.txt .
 .Pp
 The property
 .Va name
diff --git a/share/man/man4/owc.4 b/share/man/man4/owc.4
index 62e5caf65341..43d6cb776ae4 100644
--- a/share/man/man4/owc.4
+++ b/share/man/man4/owc.4
@@ -68,7 +68,7 @@ to.
 For more details about the
 .Va gpios
 property, please consult
-.Pa /usr/src/sys/boot/fdt/dts/bindings-gpio.txt .
+.Pa /usr/src/sys/dts/bindings-gpio.txt .
 .Sh SEE ALSO
 .Xr gpiobus 4 ,
 .Xr ow 4 ,
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
similarity index 100%
rename from sys/boot/fdt/dts/Makefile
rename to sys/dts/Makefile
diff --git a/sys/boot/fdt/dts/Makefile.inc b/sys/dts/Makefile.inc
similarity index 100%
rename from sys/boot/fdt/dts/Makefile.inc
rename to sys/dts/Makefile.inc
diff --git a/sys/boot/fdt/dts/arm/Makefile b/sys/dts/arm/Makefile
similarity index 100%
rename from sys/boot/fdt/dts/arm/Makefile
rename to sys/dts/arm/Makefile
diff --git a/sys/boot/fdt/dts/arm/a83t.dtsi b/sys/dts/arm/a83t.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/a83t.dtsi
rename to sys/dts/arm/a83t.dtsi
diff --git a/sys/boot/fdt/dts/arm/annapurna-alpine.dts b/sys/dts/arm/annapurna-alpine.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/annapurna-alpine.dts
rename to sys/dts/arm/annapurna-alpine.dts
diff --git a/sys/boot/fdt/dts/arm/apalis-imx6.dts b/sys/dts/arm/apalis-imx6.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/apalis-imx6.dts
rename to sys/dts/arm/apalis-imx6.dts
diff --git a/sys/boot/fdt/dts/arm/armada-380.dtsi b/sys/dts/arm/armada-380.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/armada-380.dtsi
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/armada-385-db-ap.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/armada-385.dtsi
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/armada-388-clearfog.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/armada-388-gp.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/armada-388.dtsi
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/armada-38x.dtsi
rename to sys/dts/arm/armada-38x.dtsi
diff --git a/sys/boot/fdt/dts/arm/bcm2835.dtsi b/sys/dts/arm/bcm2835.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/bcm2835.dtsi
rename to sys/dts/arm/bcm2835.dtsi
diff --git a/sys/boot/fdt/dts/arm/bcm2836.dtsi b/sys/dts/arm/bcm2836.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/bcm2836.dtsi
rename to sys/dts/arm/bcm2836.dtsi
diff --git a/sys/boot/fdt/dts/arm/db78100.dts b/sys/dts/arm/db78100.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/db78100.dts
rename to sys/dts/arm/db78100.dts
diff --git a/sys/boot/fdt/dts/arm/db78460.dts b/sys/dts/arm/db78460.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/db78460.dts
rename to sys/dts/arm/db78460.dts
diff --git a/sys/boot/fdt/dts/arm/db88f5182.dts b/sys/dts/arm/db88f5182.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/db88f5182.dts
rename to sys/dts/arm/db88f5182.dts
diff --git a/sys/boot/fdt/dts/arm/db88f5281.dts b/sys/dts/arm/db88f5281.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/db88f5281.dts
rename to sys/dts/arm/db88f5281.dts
diff --git a/sys/boot/fdt/dts/arm/db88f6281.dts b/sys/dts/arm/db88f6281.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/db88f6281.dts
rename to sys/dts/arm/db88f6281.dts
diff --git a/sys/boot/fdt/dts/arm/digi-ccwmx53.dts b/sys/dts/arm/digi-ccwmx53.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/digi-ccwmx53.dts
rename to sys/dts/arm/digi-ccwmx53.dts
diff --git a/sys/boot/fdt/dts/arm/dockstar.dts b/sys/dts/arm/dockstar.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/dockstar.dts
rename to sys/dts/arm/dockstar.dts
diff --git a/sys/boot/fdt/dts/arm/dreamplug-1001.dts b/sys/dts/arm/dreamplug-1001.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/dreamplug-1001.dts
rename to sys/dts/arm/dreamplug-1001.dts
diff --git a/sys/boot/fdt/dts/arm/dreamplug-1001N.dts b/sys/dts/arm/dreamplug-1001N.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/dreamplug-1001N.dts
rename to sys/dts/arm/dreamplug-1001N.dts
diff --git a/sys/boot/fdt/dts/arm/ea3250.dts b/sys/dts/arm/ea3250.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/ea3250.dts
rename to sys/dts/arm/ea3250.dts
diff --git a/sys/boot/fdt/dts/arm/efikamx.dts b/sys/dts/arm/efikamx.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/efikamx.dts
rename to sys/dts/arm/efikamx.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5.dtsi b/sys/dts/arm/exynos5.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5.dtsi
rename to sys/dts/arm/exynos5.dtsi
diff --git a/sys/boot/fdt/dts/arm/exynos5250-arndale.dts b/sys/dts/arm/exynos5250-arndale.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5250-arndale.dts
rename to sys/dts/arm/exynos5250-arndale.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5250-snow.dts b/sys/dts/arm/exynos5250-snow.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5250-snow.dts
rename to sys/dts/arm/exynos5250-snow.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5250-spring.dts b/sys/dts/arm/exynos5250-spring.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5250-spring.dts
rename to sys/dts/arm/exynos5250-spring.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5250.dtsi b/sys/dts/arm/exynos5250.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5250.dtsi
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
rename to sys/dts/arm/exynos5420-peach-pit.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5420.dtsi b/sys/dts/arm/exynos5420.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5420.dtsi
rename to sys/dts/arm/exynos5420.dtsi
diff --git a/sys/boot/fdt/dts/arm/h3.dtsi b/sys/dts/arm/h3.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/h3.dtsi
rename to sys/dts/arm/h3.dtsi
diff --git a/sys/boot/fdt/dts/arm/hl201.dts b/sys/dts/arm/hl201.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/hl201.dts
rename to sys/dts/arm/hl201.dts
diff --git a/sys/boot/fdt/dts/arm/imx51x.dtsi b/sys/dts/arm/imx51x.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/imx51x.dtsi
rename to sys/dts/arm/imx51x.dtsi
diff --git a/sys/boot/fdt/dts/arm/imx53x.dtsi b/sys/dts/arm/imx53x.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/imx53x.dtsi
rename to sys/dts/arm/imx53x.dtsi
diff --git a/sys/boot/fdt/dts/arm/imx6.dtsi b/sys/dts/arm/imx6.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/imx6.dtsi
rename to sys/dts/arm/imx6.dtsi
diff --git a/sys/boot/fdt/dts/arm/meson3.dtsi b/sys/dts/arm/meson3.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/meson3.dtsi
rename to sys/dts/arm/meson3.dtsi
diff --git a/sys/boot/fdt/dts/arm/meson8b.dtsi b/sys/dts/arm/meson8b.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/meson8b.dtsi
rename to sys/dts/arm/meson8b.dtsi
diff --git a/sys/boot/fdt/dts/arm/nanopi-neo.dts b/sys/dts/arm/nanopi-neo.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/nanopi-neo.dts
rename to sys/dts/arm/nanopi-neo.dts
diff --git a/sys/boot/fdt/dts/arm/odroidc1.dts b/sys/dts/arm/odroidc1.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/odroidc1.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/orangepi-plus-2e.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/pandaboard-common.dtsi
rename to sys/dts/arm/pandaboard-common.dtsi
diff --git a/sys/boot/fdt/dts/arm/pandaboard-es.dts b/sys/dts/arm/pandaboard-es.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/pandaboard-es.dts
rename to sys/dts/arm/pandaboard-es.dts
diff --git a/sys/boot/fdt/dts/arm/pandaboard.dts b/sys/dts/arm/pandaboard.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/pandaboard.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/rk3188-radxa.dts
rename to sys/dts/arm/rk3188-radxa.dts
diff --git a/sys/boot/fdt/dts/arm/rk3188.dtsi b/sys/dts/arm/rk3188.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/rk3188.dtsi
rename to sys/dts/arm/rk3188.dtsi
diff --git a/sys/boot/fdt/dts/arm/rpi.dts b/sys/dts/arm/rpi.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/rpi.dts
rename to sys/dts/arm/rpi.dts
diff --git a/sys/boot/fdt/dts/arm/rpi2.dts b/sys/dts/arm/rpi2.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/rpi2.dts
rename to sys/dts/arm/rpi2.dts
diff --git a/sys/boot/fdt/dts/arm/rt1310a.dtsi b/sys/dts/arm/rt1310a.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/rt1310a.dtsi
rename to sys/dts/arm/rt1310a.dtsi
diff --git a/sys/boot/fdt/dts/arm/sam9260ek.dts b/sys/dts/arm/sam9260ek.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/sam9260ek.dts
rename to sys/dts/arm/sam9260ek.dts
diff --git a/sys/boot/fdt/dts/arm/sheevaplug.dts b/sys/dts/arm/sheevaplug.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/sheevaplug.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/sinovoip-bpi-m3.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_beri_sdmmc.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/socfpga_cyclone5_sockit_sdmmc.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/sun7i-a20-hdmi.dtsi
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/sun8i-a83t-sinovoip-bpi-m3.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/sun8i-a83t.dtsi
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/sun8i-h3-nanopi-neo.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/tegra124-jetson-tk1-fbsd.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/tegra20-paz00.dts
rename to sys/dts/arm/tegra20-paz00.dts
diff --git a/sys/boot/fdt/dts/arm/tegra20.dtsi b/sys/dts/arm/tegra20.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/tegra20.dtsi
rename to sys/dts/arm/tegra20.dtsi
diff --git a/sys/boot/fdt/dts/arm/trimslice.dts b/sys/dts/arm/trimslice.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/trimslice.dts
rename to sys/dts/arm/trimslice.dts
diff --git a/sys/boot/fdt/dts/arm/ts7800.dts b/sys/dts/arm/ts7800.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/ts7800.dts
rename to sys/dts/arm/ts7800.dts
diff --git a/sys/boot/fdt/dts/arm/ufw.dts b/sys/dts/arm/ufw.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/ufw.dts
rename to sys/dts/arm/ufw.dts
diff --git a/sys/boot/fdt/dts/arm/versatilepb.dts b/sys/dts/arm/versatilepb.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/versatilepb.dts
rename to sys/dts/arm/versatilepb.dts
diff --git a/sys/boot/fdt/dts/arm/vsatv102-m6.dts b/sys/dts/arm/vsatv102-m6.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/vsatv102-m6.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm/vybrid-cosmic.dts
rename to sys/dts/arm/vybrid-cosmic.dts
diff --git a/sys/boot/fdt/dts/arm/vybrid-quartz.dts b/sys/dts/arm/vybrid-quartz.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/vybrid-quartz.dts
rename to sys/dts/arm/vybrid-quartz.dts
diff --git a/sys/boot/fdt/dts/arm/vybrid.dtsi b/sys/dts/arm/vybrid.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/vybrid.dtsi
rename to sys/dts/arm/vybrid.dtsi
diff --git a/sys/boot/fdt/dts/arm/wandboard-dual.dts b/sys/dts/arm/wandboard-dual.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/wandboard-dual.dts
rename to sys/dts/arm/wandboard-dual.dts
diff --git a/sys/boot/fdt/dts/arm/wandboard-quad.dts b/sys/dts/arm/wandboard-quad.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/wandboard-quad.dts
rename to sys/dts/arm/wandboard-quad.dts
diff --git a/sys/boot/fdt/dts/arm/wandboard-solo.dts b/sys/dts/arm/wandboard-solo.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/wandboard-solo.dts
rename to sys/dts/arm/wandboard-solo.dts
diff --git a/sys/boot/fdt/dts/arm/wzr2-g300n.dts b/sys/dts/arm/wzr2-g300n.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/wzr2-g300n.dts
rename to sys/dts/arm/wzr2-g300n.dts
diff --git a/sys/boot/fdt/dts/arm/xpowers-axp209.dtsi b/sys/dts/arm/xpowers-axp209.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/xpowers-axp209.dtsi
rename to sys/dts/arm/xpowers-axp209.dtsi
diff --git a/sys/boot/fdt/dts/arm/yyhd18-m3.dts b/sys/dts/arm/yyhd18-m3.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/yyhd18-m3.dts
rename to sys/dts/arm/yyhd18-m3.dts
diff --git a/sys/boot/fdt/dts/arm/zedboard.dts b/sys/dts/arm/zedboard.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/zedboard.dts
rename to sys/dts/arm/zedboard.dts
diff --git a/sys/boot/fdt/dts/arm/zybo.dts b/sys/dts/arm/zybo.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/zybo.dts
rename to sys/dts/arm/zybo.dts
diff --git a/sys/boot/fdt/dts/arm/zynq-7000.dtsi b/sys/dts/arm/zynq-7000.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm/zynq-7000.dtsi
rename to sys/dts/arm/zynq-7000.dtsi
diff --git a/sys/boot/fdt/dts/arm64/Makefile b/sys/dts/arm64/Makefile
similarity index 100%
rename from sys/boot/fdt/dts/arm64/Makefile
rename to sys/dts/arm64/Makefile
diff --git a/sys/boot/fdt/dts/arm64/a64.dtsi b/sys/dts/arm64/a64.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/arm64/a64.dtsi
rename to sys/dts/arm64/a64.dtsi
diff --git a/sys/boot/fdt/dts/arm64/pine64_plus.dts b/sys/dts/arm64/pine64_plus.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm64/pine64_plus.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm64/sun50i-a64-pine64-common.dtsi
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm64/sun50i-a64-pine64-plus.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm64/sun50i-a64-pine64.dts
rename to 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
similarity index 100%
rename from sys/boot/fdt/dts/arm64/sun50i-a64.dtsi
rename to sys/dts/arm64/sun50i-a64.dtsi
diff --git a/sys/boot/fdt/dts/bindings-gpio.txt b/sys/dts/bindings-gpio.txt
similarity index 100%
rename from sys/boot/fdt/dts/bindings-gpio.txt
rename to sys/dts/bindings-gpio.txt
diff --git a/sys/boot/fdt/dts/bindings-localbus.txt b/sys/dts/bindings-localbus.txt
similarity index 100%
rename from sys/boot/fdt/dts/bindings-localbus.txt
rename to sys/dts/bindings-localbus.txt
diff --git a/sys/boot/fdt/dts/bindings-mpp.txt b/sys/dts/bindings-mpp.txt
similarity index 100%
rename from sys/boot/fdt/dts/bindings-mpp.txt
rename to sys/dts/bindings-mpp.txt
diff --git a/sys/boot/fdt/dts/mips/Makefile b/sys/dts/mips/Makefile
similarity index 100%
rename from sys/boot/fdt/dts/mips/Makefile
rename to sys/dts/mips/Makefile
diff --git a/sys/boot/fdt/dts/mips/beri-netfpga.dts b/sys/dts/mips/beri-netfpga.dts
similarity index 100%
rename from sys/boot/fdt/dts/mips/beri-netfpga.dts
rename to sys/dts/mips/beri-netfpga.dts
diff --git a/sys/boot/fdt/dts/mips/beri-sim.dts b/sys/dts/mips/beri-sim.dts
similarity index 100%
rename from sys/boot/fdt/dts/mips/beri-sim.dts
rename to sys/dts/mips/beri-sim.dts
diff --git a/sys/boot/fdt/dts/mips/beripad-de4.dts b/sys/dts/mips/beripad-de4.dts
similarity index 100%
rename from sys/boot/fdt/dts/mips/beripad-de4.dts
rename to sys/dts/mips/beripad-de4.dts
diff --git a/sys/boot/fdt/dts/mips/beripad-sockit.dts b/sys/dts/mips/beripad-sockit.dts
similarity index 100%
rename from sys/boot/fdt/dts/mips/beripad-sockit.dts
rename to sys/dts/mips/beripad-sockit.dts
diff --git a/sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi b/sys/dts/mips/fbsd-mt7620a.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi
rename to sys/dts/mips/fbsd-mt7620a.dtsi
diff --git a/sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi b/sys/dts/mips/fbsd-mt7621.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi
rename to sys/dts/mips/fbsd-mt7621.dtsi
diff --git a/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi b/sys/dts/mips/fbsd-mt7628an.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi
rename to sys/dts/mips/fbsd-mt7628an.dtsi
diff --git a/sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi b/sys/dts/mips/fbsd-rt3883.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi
rename to sys/dts/mips/fbsd-rt3883.dtsi
diff --git a/sys/boot/fdt/dts/mips/xlp-basic.dts b/sys/dts/mips/xlp-basic.dts
similarity index 100%
rename from sys/boot/fdt/dts/mips/xlp-basic.dts
rename to sys/dts/mips/xlp-basic.dts
diff --git a/sys/boot/fdt/dts/powerpc/Makefile b/sys/dts/powerpc/Makefile
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/Makefile
rename to sys/dts/powerpc/Makefile
diff --git a/sys/boot/fdt/dts/powerpc/mpc8555cds.dts b/sys/dts/powerpc/mpc8555cds.dts
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/mpc8555cds.dts
rename to sys/dts/powerpc/mpc8555cds.dts
diff --git a/sys/boot/fdt/dts/powerpc/mpc8572ds.dts b/sys/dts/powerpc/mpc8572ds.dts
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/mpc8572ds.dts
rename to sys/dts/powerpc/mpc8572ds.dts
diff --git a/sys/boot/fdt/dts/powerpc/p1020rdb.dts b/sys/dts/powerpc/p1020rdb.dts
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/p1020rdb.dts
rename to sys/dts/powerpc/p1020rdb.dts
diff --git a/sys/boot/fdt/dts/powerpc/p2020ds.dts b/sys/dts/powerpc/p2020ds.dts
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/p2020ds.dts
rename to sys/dts/powerpc/p2020ds.dts
diff --git a/sys/boot/fdt/dts/powerpc/p2041rdb.dts b/sys/dts/powerpc/p2041rdb.dts
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/p2041rdb.dts
rename to sys/dts/powerpc/p2041rdb.dts
diff --git a/sys/boot/fdt/dts/powerpc/p2041si.dtsi b/sys/dts/powerpc/p2041si.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/p2041si.dtsi
rename to sys/dts/powerpc/p2041si.dtsi
diff --git a/sys/boot/fdt/dts/powerpc/p3041ds.dts b/sys/dts/powerpc/p3041ds.dts
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/p3041ds.dts
rename to sys/dts/powerpc/p3041ds.dts
diff --git a/sys/boot/fdt/dts/powerpc/p3041si.dtsi b/sys/dts/powerpc/p3041si.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/p3041si.dtsi
rename to sys/dts/powerpc/p3041si.dtsi
diff --git a/sys/boot/fdt/dts/powerpc/p5020ds.dts b/sys/dts/powerpc/p5020ds.dts
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/p5020ds.dts
rename to sys/dts/powerpc/p5020ds.dts
diff --git a/sys/boot/fdt/dts/powerpc/p5020si.dtsi b/sys/dts/powerpc/p5020si.dtsi
similarity index 100%
rename from sys/boot/fdt/dts/powerpc/p5020si.dtsi
rename to 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