New FDT-enabled busses will use a new "fdt" attribute. Unfortunately

this attribute is currently already defined.  This define is only used
to disable the unused FDT functionality in the exynos and virtio code.
As the FDT code will be developed in a different manner than the way
those drivers are written today and the functionality has never been
enabled, simply remove the attribute and its users.

ok jsg@

17 files changed, 27 insertions, 68 deletions

diff --git a/sys/arch/armv7/conf/files.armv7 b/sys/arch/armv7/conf/files.armv7
index c5d022c2bf9..7a9dc6a811e 100644
--- a/sys/arch/armv7/conf/files.armv7
+++ b/sys/arch/armv7/conf/files.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.armv7,v 1.15 2016/04/03 12:44:37 patrick Exp $
+#	$OpenBSD: files.armv7,v 1.16 2016/04/24 00:57:23 patrick Exp $
 
 maxpartitions	16
 maxusers	2 8 64
@@ -9,7 +9,6 @@ major	{cd = 26}
 major	{rd = 18}
 
 define	fdt {}
-file	arch/armv7/fdt/fdt_machdep.c	fdt	needs-flag
 file	dev/ofw/fdt.c
 
 file	arch/arm/arm/conf.c
diff --git a/sys/arch/armv7/exynos/exclock.c b/sys/arch/armv7/exynos/exclock.c
index fdc3cbd8f16..d6c906c5a2b 100644
--- a/sys/arch/armv7/exynos/exclock.c
+++ b/sys/arch/armv7/exynos/exclock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exclock.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/* $OpenBSD: exclock.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arch/armv7/exynos/exdisplay.c b/sys/arch/armv7/exynos/exdisplay.c
index bb7c1a84f09..3326b0266f9 100644
--- a/sys/arch/armv7/exynos/exdisplay.c
+++ b/sys/arch/armv7/exynos/exdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exdisplay.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/* $OpenBSD: exdisplay.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arch/armv7/exynos/exdog.c b/sys/arch/armv7/exynos/exdog.c
index 6240cc183d9..0f92a484756 100644
--- a/sys/arch/armv7/exynos/exdog.c
+++ b/sys/arch/armv7/exynos/exdog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exdog.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/* $OpenBSD: exdog.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arch/armv7/exynos/exehci.c b/sys/arch/armv7/exynos/exehci.c
index 8d7d537ff03..9a1783bffcd 100644
--- a/sys/arch/armv7/exynos/exehci.c
+++ b/sys/arch/armv7/exynos/exehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exehci.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/*	$OpenBSD: exehci.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/armv7/exynos/exesdhc.c b/sys/arch/armv7/exynos/exesdhc.c
index 5d9ea8e5067..8d8df1ac7e3 100644
--- a/sys/arch/armv7/exynos/exesdhc.c
+++ b/sys/arch/armv7/exynos/exesdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exesdhc.c,v 1.4 2016/01/10 14:11:43 kettenis Exp $	*/
+/*	$OpenBSD: exesdhc.c,v 1.5 2016/04/24 00:57:23 patrick Exp $	*/
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -19,8 +19,6 @@
 
 /* i.MX SD/MMC support derived from /sys/dev/sdmmc/sdhc.c */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/armv7/exynos/exgpio.c b/sys/arch/armv7/exynos/exgpio.c
index f7677708c70..180fa79ac38 100644
--- a/sys/arch/armv7/exynos/exgpio.c
+++ b/sys/arch/armv7/exynos/exgpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exgpio.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/* $OpenBSD: exgpio.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arch/armv7/exynos/exiic.c b/sys/arch/armv7/exynos/exiic.c
index 0d4e284cb9d..b9e9f0e2e08 100644
--- a/sys/arch/armv7/exynos/exiic.c
+++ b/sys/arch/armv7/exynos/exiic.c
@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/armv7/exynos/exmct.c b/sys/arch/armv7/exynos/exmct.c
index 6d9f9ad2da7..b032d123ba8 100644
--- a/sys/arch/armv7/exynos/exmct.c
+++ b/sys/arch/armv7/exynos/exmct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exmct.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/* $OpenBSD: exmct.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arch/armv7/exynos/expower.c b/sys/arch/armv7/exynos/expower.c
index aa3652294b7..644f9edb301 100644
--- a/sys/arch/armv7/exynos/expower.c
+++ b/sys/arch/armv7/exynos/expower.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expower.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/* $OpenBSD: expower.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arch/armv7/exynos/exsysreg.c b/sys/arch/armv7/exynos/exsysreg.c
index bc6682d651a..d1552ee1271 100644
--- a/sys/arch/armv7/exynos/exsysreg.c
+++ b/sys/arch/armv7/exynos/exsysreg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exsysreg.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/* $OpenBSD: exsysreg.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arch/armv7/exynos/exuart.c b/sys/arch/armv7/exynos/exuart.c
index 8e51735ac9f..8112b8dc283 100644
--- a/sys/arch/armv7/exynos/exuart.c
+++ b/sys/arch/armv7/exynos/exuart.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exuart.c,v 1.2 2015/05/27 00:06:14 jsg Exp $ */
+/* $OpenBSD: exuart.c,v 1.3 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2005 Dale Rahn <drahn@motorola.com>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
diff --git a/sys/arch/armv7/exynos/exynos.c b/sys/arch/armv7/exynos/exynos.c
index 25d905e9628..16b7a1e060a 100644
--- a/sys/arch/armv7/exynos/exynos.c
+++ b/sys/arch/armv7/exynos/exynos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exynos.c,v 1.9 2016/02/02 03:31:22 jsg Exp $ */
+/* $OpenBSD: exynos.c,v 1.10 2016/04/24 00:57:23 patrick Exp $ */
 /*
  * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/armv7/exynos/exynos_machdep.c b/sys/arch/armv7/exynos/exynos_machdep.c
index b41f76933e3..4ccae1ac771 100644
--- a/sys/arch/armv7/exynos/exynos_machdep.c
+++ b/sys/arch/armv7/exynos/exynos_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exynos_machdep.c,v 1.5 2015/06/07 16:54:16 jsg Exp $	*/
+/*	$OpenBSD: exynos_machdep.c,v 1.6 2016/04/24 00:57:23 patrick Exp $	*/
 /*
  * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
diff --git a/sys/arch/armv7/exynos/files.exynos b/sys/arch/armv7/exynos/files.exynos
index ef53213e34e..89c419322f3 100644
--- a/sys/arch/armv7/exynos/files.exynos
+++ b/sys/arch/armv7/exynos/files.exynos
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.exynos,v 1.2 2015/06/07 16:54:16 jsg Exp $
+#	$OpenBSD: files.exynos,v 1.3 2016/04/24 00:57:23 patrick Exp $
 
 define exynos {}
 device exynos: exynos
@@ -11,59 +11,48 @@ file	arch/armv7/exynos/exynos5.c		exynos
 # serial ports
 device exuart
 attach	exuart at exynos
-attach	exuart at fdt with exuart_fdt
-file	arch/armv7/exynos/exuart.c		exuart | exuart_fdt
+file	arch/armv7/exynos/exuart.c		exuart
 
 device exdisplay: wsemuldisplaydev, rasops16
 attach exdisplay at exynos
-attach exdisplay at fdt with exdisplay_fdt
-file	arch/armv7/exynos/exdisplay.c		exdisplay | exdisplay_fdt
+file	arch/armv7/exynos/exdisplay.c		exdisplay
 
 device exclock
 attach exclock at exynos
-attach exclock at fdt with exclock_fdt
-file	arch/armv7/exynos/exclock.c		exclock | exclock_fdt
+file	arch/armv7/exynos/exclock.c		exclock
 
 device expower
 attach expower at exynos
-attach expower at fdt with expower_fdt
-file	arch/armv7/exynos/expower.c		expower | expower_fdt
+file	arch/armv7/exynos/expower.c		expower
 
 device exsysreg
 attach exsysreg at exynos
-attach exsysreg at fdt with exsysreg_fdt
-file	arch/armv7/exynos/exsysreg.c		exsysreg | exsysreg_fdt
+file	arch/armv7/exynos/exsysreg.c		exsysreg
 
 device exmct
 attach exmct at exynos
-attach exmct at fdt with exmct_fdt
-file	arch/armv7/exynos/exmct.c		exmct | exiomuxc_fdt
+file	arch/armv7/exynos/exmct.c		exmct
 
 device exdog
 attach exdog at exynos
-attach exdog at fdt with exdog_fdt
-file	arch/armv7/exynos/exdog.c		exdog | exdog_fdt
+file	arch/armv7/exynos/exdog.c		exdog
 
 device exgpio
 attach exgpio at exynos
-attach exgpio at fdt with exgpio_fdt
-file	arch/armv7/exynos/exgpio.c		exgpio | exgpio_fdt
+file	arch/armv7/exynos/exgpio.c		exgpio
 
 device	exiic: i2cbus
 attach	exiic at exynos
-attach	exiic at fdt with exiic_fdt
-file	arch/armv7/exynos/exiic.c		exiic | exiic_fdt
+file	arch/armv7/exynos/exiic.c		exiic
 
 device exehci {}
 attach exehci at exynos with exehci
-attach exehci at fdt with exehci_fdt
 attach ehci at exehci with ehci_ex
-file	arch/armv7/exynos/exehci.c		exehci | exehci_fdt
+file	arch/armv7/exynos/exehci.c		exehci
 
 device exesdhc: sdmmcbus
 attach exesdhc at exynos
-attach exesdhc at fdt with exesdhc_fdt
-file	arch/armv7/exynos/exesdhc.c		exesdhc | exesdhc_fdt
+file	arch/armv7/exynos/exesdhc.c		exesdhc
 
 device	crosec: wskbddev
 attach	crosec at i2c
diff --git a/sys/arch/armv7/vexpress/pl011.c b/sys/arch/armv7/vexpress/pl011.c
index 97b16986c63..50a902b6be3 100644
--- a/sys/arch/armv7/vexpress/pl011.c
+++ b/sys/arch/armv7/vexpress/pl011.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pl011.c,v 1.1 2015/06/08 06:33:16 jsg Exp $	*/
+/*	$OpenBSD: pl011.c,v 1.2 2016/04/24 00:57:23 patrick Exp $	*/
 
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
@@ -17,8 +17,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "fdt.h"
-
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
diff --git a/sys/arch/armv7/vexpress/virtio_mmio.c b/sys/arch/armv7/vexpress/virtio_mmio.c
index 1a6971da173..bee1b5ffe97 100644
--- a/sys/arch/armv7/vexpress/virtio_mmio.c
+++ b/sys/arch/armv7/vexpress/virtio_mmio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio_mmio.c,v 1.1 2015/06/08 06:33:16 jsg Exp $	*/
+/*	$OpenBSD: virtio_mmio.c,v 1.2 2016/04/24 00:57:23 patrick Exp $	*/
 /*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
 
 /*
@@ -27,7 +27,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "fdt.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>