58 files changed, 29 insertions, 18 deletions

diff --git a/sys/boot/fdt/dts/am335x-evm.dts b/sys/boot/fdt/dts/arm/am335x-evm.dts
index 30239f6..30239f6 100644
--- a/sys/boot/fdt/dts/am335x-evm.dts
+++ b/sys/boot/fdt/dts/arm/am335x-evm.dts
diff --git a/sys/boot/fdt/dts/am335x.dtsi b/sys/boot/fdt/dts/arm/am335x.dtsi
index 35cecf2..35cecf2 100644
--- a/sys/boot/fdt/dts/am335x.dtsi
+++ b/sys/boot/fdt/dts/arm/am335x.dtsi
diff --git a/sys/boot/fdt/dts/bcm2835.dtsi b/sys/boot/fdt/dts/arm/bcm2835.dtsi
index bb30248..bb30248 100644
--- a/sys/boot/fdt/dts/bcm2835.dtsi
+++ b/sys/boot/fdt/dts/arm/bcm2835.dtsi
diff --git a/sys/boot/fdt/dts/beaglebone-black.dts b/sys/boot/fdt/dts/arm/beaglebone-black.dts
index 5da633f..1833ec5 100644
--- a/sys/boot/fdt/dts/beaglebone-black.dts
+++ b/sys/boot/fdt/dts/arm/beaglebone-black.dts
@@ -150,7 +150,7 @@
 				compatible = "ti,am335x-pmic";
 				reg = <0x24>;
 			};
-		}
+		};
 	};
 
 	leds {
diff --git a/sys/boot/fdt/dts/beaglebone.dts b/sys/boot/fdt/dts/arm/beaglebone.dts
index 3f8e022..3f8e022 100644
--- a/sys/boot/fdt/dts/beaglebone.dts
+++ b/sys/boot/fdt/dts/arm/beaglebone.dts
diff --git a/sys/boot/fdt/dts/cubieboard.dts b/sys/boot/fdt/dts/arm/cubieboard.dts
index 81bce0c..81bce0c 100644
--- a/sys/boot/fdt/dts/cubieboard.dts
+++ b/sys/boot/fdt/dts/arm/cubieboard.dts
diff --git a/sys/boot/fdt/dts/cubieboard2.dts b/sys/boot/fdt/dts/arm/cubieboard2.dts
index 324ca26..324ca26 100644
--- a/sys/boot/fdt/dts/cubieboard2.dts
+++ b/sys/boot/fdt/dts/arm/cubieboard2.dts
diff --git a/sys/boot/fdt/dts/db78100.dts b/sys/boot/fdt/dts/arm/db78100.dts
index 8a9e91c..8a9e91c 100644
--- a/sys/boot/fdt/dts/db78100.dts
+++ b/sys/boot/fdt/dts/arm/db78100.dts
diff --git a/sys/boot/fdt/dts/db78460.dts b/sys/boot/fdt/dts/arm/db78460.dts
index 1407f62..1407f62 100644
--- a/sys/boot/fdt/dts/db78460.dts
+++ b/sys/boot/fdt/dts/arm/db78460.dts
diff --git a/sys/boot/fdt/dts/db88f5182.dts b/sys/boot/fdt/dts/arm/db88f5182.dts
index 6ce7b65..6ce7b65 100644
--- a/sys/boot/fdt/dts/db88f5182.dts
+++ b/sys/boot/fdt/dts/arm/db88f5182.dts
diff --git a/sys/boot/fdt/dts/db88f5281.dts b/sys/boot/fdt/dts/arm/db88f5281.dts
index 61212eb..61212eb 100644
--- a/sys/boot/fdt/dts/db88f5281.dts
+++ b/sys/boot/fdt/dts/arm/db88f5281.dts
diff --git a/sys/boot/fdt/dts/db88f6281.dts b/sys/boot/fdt/dts/arm/db88f6281.dts
index 55a27fc..55a27fc 100644
--- a/sys/boot/fdt/dts/db88f6281.dts
+++ b/sys/boot/fdt/dts/arm/db88f6281.dts
diff --git a/sys/boot/fdt/dts/digi-ccwmx53.dts b/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
index 898ffbb..898ffbb 100644
--- a/sys/boot/fdt/dts/digi-ccwmx53.dts
+++ b/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
diff --git a/sys/boot/fdt/dts/dockstar.dts b/sys/boot/fdt/dts/arm/dockstar.dts
index 595894a..595894a 100644
--- a/sys/boot/fdt/dts/dockstar.dts
+++ b/sys/boot/fdt/dts/arm/dockstar.dts
diff --git a/sys/boot/fdt/dts/dreamplug-1001.dts b/sys/boot/fdt/dts/arm/dreamplug-1001.dts
index 92ca1b0..92ca1b0 100644
--- a/sys/boot/fdt/dts/dreamplug-1001.dts
+++ b/sys/boot/fdt/dts/arm/dreamplug-1001.dts
diff --git a/sys/boot/fdt/dts/dreamplug-1001N.dts b/sys/boot/fdt/dts/arm/dreamplug-1001N.dts
index 230a65f..230a65f 100644
--- a/sys/boot/fdt/dts/dreamplug-1001N.dts
+++ b/sys/boot/fdt/dts/arm/dreamplug-1001N.dts
diff --git a/sys/boot/fdt/dts/ea3250.dts b/sys/boot/fdt/dts/arm/ea3250.dts
index 2c466e3..2c466e3 100644
--- a/sys/boot/fdt/dts/ea3250.dts
+++ b/sys/boot/fdt/dts/arm/ea3250.dts
diff --git a/sys/boot/fdt/dts/efikamx.dts b/sys/boot/fdt/dts/arm/efikamx.dts
index 22b455b..22b455b 100644
--- a/sys/boot/fdt/dts/efikamx.dts
+++ b/sys/boot/fdt/dts/arm/efikamx.dts
diff --git a/sys/boot/fdt/dts/exynos5250-arndale.dts b/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
index 67cadcb..67cadcb 100644
--- a/sys/boot/fdt/dts/exynos5250-arndale.dts
+++ b/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
diff --git a/sys/boot/fdt/dts/exynos5250.dtsi b/sys/boot/fdt/dts/arm/exynos5250.dtsi
index 860fcd0..860fcd0 100644
--- a/sys/boot/fdt/dts/exynos5250.dtsi
+++ b/sys/boot/fdt/dts/arm/exynos5250.dtsi
diff --git a/sys/boot/fdt/dts/imx51x.dtsi b/sys/boot/fdt/dts/arm/imx51x.dtsi
index cc06f0f..cc06f0f 100644
--- a/sys/boot/fdt/dts/imx51x.dtsi
+++ b/sys/boot/fdt/dts/arm/imx51x.dtsi
diff --git a/sys/boot/fdt/dts/imx53-qsb.dts b/sys/boot/fdt/dts/arm/imx53-qsb.dts
index 1184cb3..c644f54 100644
--- a/sys/boot/fdt/dts/imx53-qsb.dts
+++ b/sys/boot/fdt/dts/arm/imx53-qsb.dts
@@ -105,7 +105,7 @@
 			ethernet@63fec000 {
 				status = "okay";
 				phy-mode = "rmii";
-			}
+			};
 			i2c@63fc4000 {
 				status = "okay";
 			};
diff --git a/sys/boot/fdt/dts/imx53x.dtsi b/sys/boot/fdt/dts/arm/imx53x.dtsi
index eafabcb..075bcad 100644
--- a/sys/boot/fdt/dts/imx53x.dtsi
+++ b/sys/boot/fdt/dts/arm/imx53x.dtsi
@@ -95,7 +95,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
     		interrupt-parent = <&tzic>;
-		ranges = <0x50000000 0x14000000>;
+		ranges;
 
 		aips@50000000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";
diff --git a/sys/boot/fdt/dts/imx6.dtsi b/sys/boot/fdt/dts/arm/imx6.dtsi
index da81d79..35e8784 100644
--- a/sys/boot/fdt/dts/imx6.dtsi
+++ b/sys/boot/fdt/dts/arm/imx6.dtsi
@@ -99,7 +99,7 @@
 				reg = <0x020c8000 0x1000>;
 				interrupt-parent = <&gic>;
 				interrupts = <49>;
-			}
+			};
 
 			gpt: timer@02098000 {
 				compatible = "fsl,imx6q-gpt", "fsl,imx51-gpt";
@@ -343,7 +343,7 @@
 			ocotp0: ocotp@021bc000 {
 				compatible = "fsl,imx6q-ocotp";
 				reg = <0x021bc000 0x4000>;
-			}
+			};
 		};
 	};
 };
diff --git a/sys/boot/fdt/dts/p1020rdb.dts b/sys/boot/fdt/dts/arm/p1020rdb.dts
index ec5118c..ec5118c 100644
--- a/sys/boot/fdt/dts/p1020rdb.dts
+++ b/sys/boot/fdt/dts/arm/p1020rdb.dts
diff --git a/sys/boot/fdt/dts/p2020ds.dts b/sys/boot/fdt/dts/arm/p2020ds.dts
index 7823429..7823429 100644
--- a/sys/boot/fdt/dts/p2020ds.dts
+++ b/sys/boot/fdt/dts/arm/p2020ds.dts
diff --git a/sys/boot/fdt/dts/p2041rdb.dts b/sys/boot/fdt/dts/arm/p2041rdb.dts
index aa5af07..aa5af07 100644
--- a/sys/boot/fdt/dts/p2041rdb.dts
+++ b/sys/boot/fdt/dts/arm/p2041rdb.dts
diff --git a/sys/boot/fdt/dts/p2041si.dtsi b/sys/boot/fdt/dts/arm/p2041si.dtsi
index 9db01fa..9db01fa 100644
--- a/sys/boot/fdt/dts/p2041si.dtsi
+++ b/sys/boot/fdt/dts/arm/p2041si.dtsi
diff --git a/sys/boot/fdt/dts/p3041ds.dts b/sys/boot/fdt/dts/arm/p3041ds.dts
index 70787e4..70787e4 100644
--- a/sys/boot/fdt/dts/p3041ds.dts
+++ b/sys/boot/fdt/dts/arm/p3041ds.dts
diff --git a/sys/boot/fdt/dts/p3041si.dtsi b/sys/boot/fdt/dts/arm/p3041si.dtsi
index 3335e48..3335e48 100644
--- a/sys/boot/fdt/dts/p3041si.dtsi
+++ b/sys/boot/fdt/dts/arm/p3041si.dtsi
diff --git a/sys/boot/fdt/dts/p5020ds.dts b/sys/boot/fdt/dts/arm/p5020ds.dts
index cb07045..cb07045 100644
--- a/sys/boot/fdt/dts/p5020ds.dts
+++ b/sys/boot/fdt/dts/arm/p5020ds.dts
diff --git a/sys/boot/fdt/dts/p5020si.dtsi b/sys/boot/fdt/dts/arm/p5020si.dtsi
index 27699cb..27699cb 100644
--- a/sys/boot/fdt/dts/p5020si.dtsi
+++ b/sys/boot/fdt/dts/arm/p5020si.dtsi
diff --git a/sys/boot/fdt/dts/pandaboard.dts b/sys/boot/fdt/dts/arm/pandaboard.dts
index 5544dc5..5544dc5 100644
--- a/sys/boot/fdt/dts/pandaboard.dts
+++ b/sys/boot/fdt/dts/arm/pandaboard.dts
diff --git a/sys/boot/fdt/dts/rk3188-radxa.dts b/sys/boot/fdt/dts/arm/rk3188-radxa.dts
index 7fc8ec5..7fc8ec5 100644
--- a/sys/boot/fdt/dts/rk3188-radxa.dts
+++ b/sys/boot/fdt/dts/arm/rk3188-radxa.dts
diff --git a/sys/boot/fdt/dts/rk3188.dtsi b/sys/boot/fdt/dts/arm/rk3188.dtsi
index ca04159..51d1381 100644
--- a/sys/boot/fdt/dts/rk3188.dtsi
+++ b/sys/boot/fdt/dts/arm/rk3188.dtsi
@@ -77,7 +77,6 @@
 
 		timer@20038000 {
 			compatible = "rockchip,rk30xx-timer";
-			compatible = "rockchip,rk3188-dw-apb-timer-osc";
 			reg = <0x20038000 0x20>;
 			interrupts = <76>;
 			clock-frequency = <24000000>;
diff --git a/sys/boot/fdt/dts/rpi.dts b/sys/boot/fdt/dts/arm/rpi.dts
index 318591a..445d1ea 100644
--- a/sys/boot/fdt/dts/rpi.dts
+++ b/sys/boot/fdt/dts/arm/rpi.dts
@@ -28,13 +28,13 @@
 
 /include/ "bcm2835.dtsi"
 
-/memreserve/ 0x08000000 0x08000000;	/* Set by VideoCore */
-
 / {
 	model = "Raspberry Pi (BCM2835)";
 	compatible = "raspberrypi,model-a", "raspberrypi,model-b", 
 		     "broadcom,bcm2835-vc", "broadcom,bcm2708-vc";
 
+	memreserve = <0x08000000 0x08000000>;	/* Set by VideoCore */
+
 	memory {
 		device_type = "memory";
 		reg = <0 0x8000000>; /* 128MB, Set by VideoCore */
diff --git a/sys/boot/fdt/dts/sheevaplug.dts b/sys/boot/fdt/dts/arm/sheevaplug.dts
index 3d347da..3d347da 100644
--- a/sys/boot/fdt/dts/sheevaplug.dts
+++ b/sys/boot/fdt/dts/arm/sheevaplug.dts
diff --git a/sys/boot/fdt/dts/tegra20-paz00.dts b/sys/boot/fdt/dts/arm/tegra20-paz00.dts
index 912a8f9..912a8f9 100644
--- a/sys/boot/fdt/dts/tegra20-paz00.dts
+++ b/sys/boot/fdt/dts/arm/tegra20-paz00.dts
diff --git a/sys/boot/fdt/dts/tegra20.dtsi b/sys/boot/fdt/dts/arm/tegra20.dtsi
index d7107fd..d7107fd 100644
--- a/sys/boot/fdt/dts/tegra20.dtsi
+++ b/sys/boot/fdt/dts/arm/tegra20.dtsi
diff --git a/sys/boot/fdt/dts/trimslice.dts b/sys/boot/fdt/dts/arm/trimslice.dts
index ac7017f..ac7017f 100644
--- a/sys/boot/fdt/dts/trimslice.dts
+++ b/sys/boot/fdt/dts/arm/trimslice.dts
diff --git a/sys/boot/fdt/dts/ts7800.dts b/sys/boot/fdt/dts/arm/ts7800.dts
index 547a2d7..547a2d7 100644
--- a/sys/boot/fdt/dts/ts7800.dts
+++ b/sys/boot/fdt/dts/arm/ts7800.dts
diff --git a/sys/boot/fdt/dts/versatilepb.dts b/sys/boot/fdt/dts/arm/versatilepb.dts
index ca58e88..ca58e88 100644
--- a/sys/boot/fdt/dts/versatilepb.dts
+++ b/sys/boot/fdt/dts/arm/versatilepb.dts
diff --git a/sys/boot/fdt/dts/vybrid-colibri-vf50.dts b/sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts
index 6d4d934..6d4d934 100644
--- a/sys/boot/fdt/dts/vybrid-colibri-vf50.dts
+++ b/sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts
diff --git a/sys/boot/fdt/dts/vybrid-cosmic.dts b/sys/boot/fdt/dts/arm/vybrid-cosmic.dts
index c98c093..c98c093 100644
--- a/sys/boot/fdt/dts/vybrid-cosmic.dts
+++ b/sys/boot/fdt/dts/arm/vybrid-cosmic.dts
diff --git a/sys/boot/fdt/dts/vybrid-quartz.dts b/sys/boot/fdt/dts/arm/vybrid-quartz.dts
index d978796..d978796 100644
--- a/sys/boot/fdt/dts/vybrid-quartz.dts
+++ b/sys/boot/fdt/dts/arm/vybrid-quartz.dts
diff --git a/sys/boot/fdt/dts/vybrid.dtsi b/sys/boot/fdt/dts/arm/vybrid.dtsi
index 154c1ab..154c1ab 100644
--- a/sys/boot/fdt/dts/vybrid.dtsi
+++ b/sys/boot/fdt/dts/arm/vybrid.dtsi
diff --git a/sys/boot/fdt/dts/wandboard-dual.dts b/sys/boot/fdt/dts/arm/wandboard-dual.dts
index 65a88c4..65a88c4 100644
--- a/sys/boot/fdt/dts/wandboard-dual.dts
+++ b/sys/boot/fdt/dts/arm/wandboard-dual.dts
diff --git a/sys/boot/fdt/dts/wandboard-quad.dts b/sys/boot/fdt/dts/arm/wandboard-quad.dts
index 71c5156..71c5156 100644
--- a/sys/boot/fdt/dts/wandboard-quad.dts
+++ b/sys/boot/fdt/dts/arm/wandboard-quad.dts
diff --git a/sys/boot/fdt/dts/wandboard-solo.dts b/sys/boot/fdt/dts/arm/wandboard-solo.dts
index 70e05e0..70e05e0 100644
--- a/sys/boot/fdt/dts/wandboard-solo.dts
+++ b/sys/boot/fdt/dts/arm/wandboard-solo.dts
diff --git a/sys/boot/fdt/dts/zedboard.dts b/sys/boot/fdt/dts/arm/zedboard.dts
index a95a2f7..a95a2f7 100644
--- a/sys/boot/fdt/dts/zedboard.dts
+++ b/sys/boot/fdt/dts/arm/zedboard.dts
diff --git a/sys/boot/fdt/dts/beri-netfpga.dts b/sys/boot/fdt/dts/mips/beri-netfpga.dts
index 6979168..3fe8c2d 100644
--- a/sys/boot/fdt/dts/beri-netfpga.dts
+++ b/sys/boot/fdt/dts/mips/beri-netfpga.dts
@@ -66,7 +66,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <0>;
+			reg = <0 1>;
 			status = "okay";
 		};
 
@@ -75,7 +75,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <1>;
+			reg = <1 1>;
 			// XXX: should we need cached prefix?
 			cpu-release-addr = <0xffffffff 0x800fffe0>;
 		};
diff --git a/sys/boot/fdt/dts/beri-sim.dts b/sys/boot/fdt/dts/mips/beri-sim.dts
index 4148bb9..e4f193e 100644
--- a/sys/boot/fdt/dts/beri-sim.dts
+++ b/sys/boot/fdt/dts/mips/beri-sim.dts
@@ -64,7 +64,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <0>;
+			reg = <0 1>;
 			status = "okay";
 		};
 
@@ -73,7 +73,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <1>;
+			reg = <1 1>;
 			// XXX: should we need cached prefix?
 			cpu-release-addr = <0xffffffff 0x800fffe0>;
 		};
diff --git a/sys/boot/fdt/dts/beripad-de4.dts b/sys/boot/fdt/dts/mips/beripad-de4.dts
index 4d4126c..4a13622 100644
--- a/sys/boot/fdt/dts/beripad-de4.dts
+++ b/sys/boot/fdt/dts/mips/beripad-de4.dts
@@ -64,7 +64,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <0>;
+			reg = <0 1>;
 			status = "okay";
 		};
 
@@ -73,7 +73,7 @@
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
 
-			reg = <1>;
+			reg = <1 1>;
 			// XXX: should we need cached prefix?
 			cpu-release-addr = <0xffffffff 0x800fffe0>;
 		};
diff --git a/sys/boot/fdt/dts/xlp-basic.dts b/sys/boot/fdt/dts/mips/xlp-basic.dts
index a66c11d..a66c11d 100644
--- a/sys/boot/fdt/dts/xlp-basic.dts
+++ b/sys/boot/fdt/dts/mips/xlp-basic.dts
diff --git a/sys/boot/fdt/dts/mpc8555cds.dts b/sys/boot/fdt/dts/powerpc/mpc8555cds.dts
index 34991ba..34991ba 100644
--- a/sys/boot/fdt/dts/mpc8555cds.dts
+++ b/sys/boot/fdt/dts/powerpc/mpc8555cds.dts
diff --git a/sys/boot/fdt/dts/mpc8572ds.dts b/sys/boot/fdt/dts/powerpc/mpc8572ds.dts
index 67f0d66..67f0d66 100644
--- a/sys/boot/fdt/dts/mpc8572ds.dts
+++ b/sys/boot/fdt/dts/powerpc/mpc8572ds.dts
diff --git a/sys/conf/files b/sys/conf/files
index 37173e4..a805743 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -54,12 +54,13 @@ aic79xx_reg_print.o		optional ahd pci ahd_reg_pretty_print	   \
 # The 'fdt_dtb_file' target covers an actual DTB file name, which is derived
 # from the specified source (DTS) file: <platform>.dts -> <platform>.dtb
 #
-fdt_dtb_file			optional fdt \
-	compile-with "if [ -f $S/boot/fdt/dts/${FDT_DTS_FILE} ]; then dtc -O dtb -o ${FDT_DTS_FILE:R}.dtb -b 0 -p 1024 $S/boot/fdt/dts/${FDT_DTS_FILE}; fi" \
+fdt_dtb_file			optional fdt fdt_dtb_static \
+	compile-with "sh $S/tools/fdt/make_dtb.sh $S ${FDT_DTS_FILE} ${.CURDIR}/${FDT_DTS_FILE:R}.dtb" \
 	no-obj no-implicit-rule before-depend	\
 	clean		"${FDT_DTS_FILE:R}.dtb"
 fdt_static_dtb.h		optional fdt fdt_dtb_static \
-	compile-with "sh $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ." \
+	compile-with "sh $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.CURDIR}" \
+	dependency	"fdt_dtb_file" \
 	no-obj no-implicit-rule before-depend \
 	clean		"fdt_static_dtb.h"
 feeder_eq_gen.h			optional sound				   \
@@ -1406,7 +1407,7 @@ dev/fb/splash.c			optional sc splash
 dev/fdt/fdt_common.c		optional fdt
 dev/fdt/fdt_slicer.c		optional fdt cfi | fdt nand
 dev/fdt/fdt_static_dtb.S	optional fdt fdt_dtb_static \
-	dependency	"$S/boot/fdt/dts/${FDT_DTS_FILE}"
+	dependency	"$S/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE}"
 dev/fdt/simplebus.c		optional fdt
 dev/fe/if_fe.c			optional fe
 dev/fe/if_fe_pccard.c		optional fe pccard
diff --git a/sys/tools/fdt/make_dtb.sh b/sys/tools/fdt/make_dtb.sh
new file mode 100755
index 0000000..900ad9b
--- /dev/null
+++ b/sys/tools/fdt/make_dtb.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+# Script generates dtb file ($3) from dts source ($2) in build tree S ($1)
+S=$1
+dts=$2
+dtb=$3
+
+cpp -x assembler-with-cpp -I $S/gnu/dts/include -I $S/boot/fdt/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $dts /dev/null | 
+	dtc -O dtb -o $dtb -b 0 -p 1024 -i $S/boot/fdt/dts/${MACHINE} -i $S/gnu/dts/${MACHINE}