Index: stable/11/sys/boot/fdt/dts/arm/pcduino3b.dts
===================================================================
--- stable/11/sys/boot/fdt/dts/arm/pcduino3b.dts	(revision 304214)
+++ stable/11/sys/boot/fdt/dts/arm/pcduino3b.dts	(nonexistent)
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include "sun7i-a20-pcduino3.dts"
-#include "sun7i-a20-hdmi.dtsi"
-#include "xpowers-axp209.dtsi"
-
-/ {
-	soc@01c00000 {
-		hdmi@01c16000 {
-			status = "okay";
-		};
-
-		hdmiaudio {
-			status = "okay";
-		};
-	};
-};
-
-&gmac {
-      pinctrl-0 = <&gmac_pins_rgmii_a>;
-      phy-mode = "rgmii";
-};

Property changes on: stable/11/sys/boot/fdt/dts/arm/pcduino3b.dts
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: stable/11/sys/boot/fdt/dts/arm/pcduino3.dts
===================================================================
--- stable/11/sys/boot/fdt/dts/arm/pcduino3.dts	(nonexistent)
+++ stable/11/sys/boot/fdt/dts/arm/pcduino3.dts	(revision 304215)
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include "sun7i-a20-pcduino3.dts"
+#include "sun7i-a20-hdmi.dtsi"
+#include "xpowers-axp209.dtsi"
+
+/ {
+	soc@01c00000 {
+		hdmi@01c16000 {
+			status = "okay";
+		};
+
+		hdmiaudio {
+			status = "okay";
+		};
+	};
+};
+
+&gmac {
+      pinctrl-0 = <&gmac_pins_rgmii_a>;
+      phy-mode = "rgmii";
+};

Property changes on: stable/11/sys/boot/fdt/dts/arm/pcduino3.dts
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/11/sys/modules/dtb/allwinner/Makefile
===================================================================
--- stable/11/sys/modules/dtb/allwinner/Makefile	(revision 304214)
+++ stable/11/sys/modules/dtb/allwinner/Makefile	(revision 304215)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 # All the dts files for allwinner systems we support.
 DTS=	\
 	bananapi.dts \
 	bananapim2.dts \
 	cubieboard.dts \
 	cubieboard2.dts \
 	olimex-a20-som-evb.dts \
 	olinuxino-lime.dts \
-	pcduino3b.dts \
+	pcduino3.dts \
 	sinovoip-bpi-m3.dts
 
 .include <bsd.dtb.mk>
Index: stable/11
===================================================================
--- stable/11	(revision 304214)
+++ stable/11	(revision 304215)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r303974