Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -51,6 +51,17 @@
 
 ****************************** SPECIAL WARNING: ******************************
 
+20170205:
+	AM335x-based boards switched from using DTB files that contained
+	FreeBSD-specific layer to using unmodified upstream DTS. This
+	change was made to accommodate automatic board type detection by
+	U-Boot. Current upstream DTS files do not support spi1, i2c1,
+	pruss, and pmic devices. To get this functionality back users
+	should force usage of FreeBSD-specific DTB files by setting fdt_file
+	variable in /boot/loader.conf, i.e.:
+	  fdt_file="beaglebone-black.dtb"
+	This change affects users of Beaglebone and Beaglebone Black boards.
+
 20170127:
 	The WITH_LLD_AS_LD / WITHOUT_LLD_AS_LD build knobs have been renamed
 	WITH_LLD_IS_LD / WITHOUT_LLD_IS_LD, for consistency with CLANG_IS_CC.
Index: sys/boot/fdt/dts/arm/beaglebone-black.dts
===================================================================
--- sys/boot/fdt/dts/arm/beaglebone-black.dts
+++ sys/boot/fdt/dts/arm/beaglebone-black.dts
@@ -27,7 +27,7 @@
  */
 
 
-#include "am335x-boneblack.dts"
+#include "gnu/dts/arm/am335x-boneblack.dts"
 #include "beaglebone-common.dtsi"
 
 &am33xx_pinmux {
@@ -49,12 +49,6 @@
 	};
 };
 
-&i2c0 {
-	tda998x: tda19988 {
-		status = "okay";
- 	};
-};
-
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;
@@ -62,26 +56,9 @@
 	status = "okay";
 };
 
-&i2c2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c2_pins>;
-
-	status = "okay";
-};
-
 &spi1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi1_pins>;
 
 	status = "okay";
 };
-
-&lcdc {
-	hdmi = <&tda998x>;
-};
-
-/ {
-	hdmi {
-		status = "disabled";
-	};
-};
Index: sys/boot/fdt/dts/arm/beaglebone.dts
===================================================================
--- sys/boot/fdt/dts/arm/beaglebone.dts
+++ sys/boot/fdt/dts/arm/beaglebone.dts
@@ -26,5 +26,5 @@
  * $FreeBSD$
  */
 
-#include "am335x-bone.dts"
+#include "gnu/dts/arm/am335x-bone.dts"
 #include "beaglebone-common.dtsi"
Index: sys/modules/dtb/am335x/Makefile
===================================================================
--- sys/modules/dtb/am335x/Makefile
+++ sys/modules/dtb/am335x/Makefile
@@ -4,10 +4,8 @@
 	am335x-bone.dts \
 	am335x-boneblack.dts \
 	am335x-bonegreen.dts \
+	beaglebone.dts \
+	beaglebone-black.dts \
 	ufw.dts
 
-LINKS= \
-	${DTBDIR}/am335x-bone.dtb ${DTBDIR}/beaglebone.dtb \
-	${DTBDIR}/am335x-boneblack.dtb ${DTBDIR}/beaglebone-black.dtb
-
 .include <bsd.dtb.mk>
Index: sys/tools/fdt/make_dtb.sh
===================================================================
--- sys/tools/fdt/make_dtb.sh
+++ sys/tools/fdt/make_dtb.sh
@@ -19,6 +19,6 @@
 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 | 
+    cpp -P -x assembler-with-cpp -I $S -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}
 done