Send Aviion to same place as Nova II

discussed with jsg

15 files changed, 6 insertions, 813 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 154cb13c9e0..5dbc899a2ad 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.604 2015/11/21 07:46:03 jmc Exp $
+#	$OpenBSD: Makefile,v 1.605 2015/12/01 07:50:05 deraadt Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -94,7 +94,7 @@ MLINKS+=usb.4 uhub.4
 MLINKS+=vlan.4 svlan.4
 
 # man4.hppa64
-SUBDIR=	man4.alpha man4.amd64 man4.armish man4.armv7 man4.aviion \
+SUBDIR=	man4.alpha man4.amd64 man4.armish man4.armv7 \
 	man4.hppa man4.i386 man4.landisk man4.loongson man4.luna88k \
 	man4.macppc man4.octeon \
 	man4.sgi man4.socppc man4.sparc man4.sparc64 man4.vax man4.zaurus
diff --git a/share/man/man4/man4.aviion/Makefile b/share/man/man4/man4.aviion/Makefile
deleted file mode 100644
index e0387f10b69..00000000000
--- a/share/man/man4/man4.aviion/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile,v 1.3 2013/10/15 18:13:53 miod Exp $
-
-MAN=	autoconf.4 dart.4 intro.4 le.4 mem.4 nvram.4 oaic.4 syscon.4 vme.4
-MANSUBDIR=aviion
-
-MLINKS+= mem.4 kmem.4
-.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.aviion/autoconf.4 b/share/man/man4/man4.aviion/autoconf.4
deleted file mode 100644
index 66f3cf23830..00000000000
--- a/share/man/man4/man4.aviion/autoconf.4
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"	$OpenBSD: autoconf.4,v 1.3 2010/01/02 19:55:34 schwarze Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  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.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-.\"
-.\"     from: @(#)autoconf.4	8.1 (Berkeley) 6/9/93
-.\"
-.Dd $Mdocdate: January 2 2010 $
-.Dt AUTOCONF 4 aviion
-.Os
-.Sh NAME
-.Nm autoconf
-.Nd diagnostics from the autoconfiguration code
-.Sh DESCRIPTION
-When
-.Ox
-bootstraps it probes the innards of the machine
-on which it is running
-and locates controllers, drives, and other devices, printing out
-what it finds on the console.
-This procedure is driven by a system configuration table which is processed by
-.Xr config 8
-and compiled into each kernel.
-Devices which exist in the machine but are not configured into the
-kernel are not detected.
-.Sh SEE ALSO
-.Xr intro 4 ,
-.\" .Xr boot_aviion 8 ,
-.Xr config 8
diff --git a/share/man/man4/man4.aviion/dart.4 b/share/man/man4/man4.aviion/dart.4
deleted file mode 100644
index 8c330d13370..00000000000
--- a/share/man/man4/man4.aviion/dart.4
+++ /dev/null
@@ -1,54 +0,0 @@
-.\"	$OpenBSD: dart.4,v 1.2 2013/10/15 20:34:46 jmc Exp $
-.\"
-.\" Copyright (c) 2013 Miodrag Vallat.
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: October 15 2013 $
-.Dt DART 4 aviion
-.Os
-.Sh NAME
-.Nm dart
-.Nd MC68681 or MC68692 dual UART
-.Sh SYNOPSIS
-.Cd "dart0 at syscon0 offset 0x82000"
-.Cd "dart1 at syscon0 offset 0x82c00"
-.Sh DESCRIPTION
-The MC68681 and MC68692 dual asynchronous receiver/transmitter
-.Pq Tn DUART
-component provides two serial ports, as well as a 16-bit programmable
-counter/timer.
-.Pp
-The
-.Nm
-driver provides support for the two serial ports found on board all
-AViiON systems.
-.Pp
-The
-.Nm
-serial ports have a two character buffer on the transmit path, and a four
-character buffer on the receive path.
-.Pp
-The following link speeds are supported by the
-.Nm
-driver:
-50, 75, 110, 134.5, 150, 200, 300, 600, 1050, 1200, 1800, 200, 2400, 4800,
-7200, 9600, 19200 and 38400 bps.
-.Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /dev/tty[ab] dart0 serial ports
-.It Pa /dev/tty[cd] dart1 serial ports
-.El
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr tty 4
diff --git a/share/man/man4/man4.aviion/intro.4 b/share/man/man4/man4.aviion/intro.4
deleted file mode 100644
index 682cbf6877b..00000000000
--- a/share/man/man4/man4.aviion/intro.4
+++ /dev/null
@@ -1,119 +0,0 @@
-.\"	$OpenBSD: intro.4,v 1.10 2014/09/19 12:24:37 schwarze Exp $
-.\"
-.\" Copyright (c) 1983, 1986, 1991 Regents of the University of California.
-.\" 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.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-.\"
-.\"     from: @(#)intro.4	5.2 (Berkeley) 3/27/91
-.\"
-.Dd $Mdocdate: September 19 2014 $
-.Dt INTRO 4 aviion
-.Os
-.Sh NAME
-.Nm intro
-.Nd introduction to special files and hardware support
-.Sh DESCRIPTION
-The manual pages in section 4 describe the special files,
-related driver functions, and networking support
-available in the system.
-In this part of the manual, the SYNOPSIS section of
-each configurable device gives a sample specification
-for use in constructing a system description for the
-.Xr config 8
-program.
-The DIAGNOSTICS section lists messages which may appear on the console
-and/or in the system error log
-.Pa /var/log/messages
-due to errors in device operation;
-see
-.Xr syslogd 8
-for more information.
-.Pp
-This section contains both devices
-which may be configured into the system
-and network related information.
-The networking support is introduced in
-.Xr netintro 4 .
-.Sh DEVICE SUPPORT
-This section describes the hardware supported on the
-AViiON platform.
-Software support for these devices comes in two forms.
-A hardware device may be supported with a character or block
-.Em device driver ,
-or it may be used within the networking subsystem and have a
-.Em network interface driver .
-Block and character devices are accessed through files in the file
-system of a special type; see
-.Xr mknod 8 .
-Network interfaces are indirectly accessed through the interprocess
-communication facilities provided by the system; see
-.Xr socket 2 .
-.Pp
-A hardware device is identified to the system at configuration time
-and the appropriate device or network interface driver is then compiled
-into the system.
-When the resultant system is booted, the autoconfiguration facilities
-in the system probe for the device and, if found, enable the software
-support for it.
-If a device does not respond at autoconfiguration
-time it is not accessible at any time afterwards.
-To enable a device which did not autoconfigure,
-the system will have to be rebooted.
-.Pp
-The autoconfiguration system is described in
-.Xr autoconf 4 .
-A list of the supported devices is given below.
-.Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
-.Pp
-.Bl -tag -compact -width 9n
-.It Xr dart 4
-MC68681 or MC68692 dual UART
-.It Xr le 4
-AMD LANCE or ILACC Ethernet device
-.It Xr nvram 4
-Mostek MK48T0x battery-backed realtime clock
-.It Xr oaic 4
-Adaptec AIC-6250 SCSI interface
-.It Xr oosiop 4
-Symbios/NCR 53C700 SCSI driver
-.It Xr syscon 4
-VME system controller
-.It Xr vme 4
-VMEbus interface
-.El
-.Sh SEE ALSO
-.Xr autoconf 4 ,
-.Xr config 8
-.Sh HISTORY
-The AViiON
-.Nm intro
-appeared in
-.Ox 4.0 .
diff --git a/share/man/man4/man4.aviion/le.4 b/share/man/man4/man4.aviion/le.4
deleted file mode 100644
index 2e4e92dec5f..00000000000
--- a/share/man/man4/man4.aviion/le.4
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"	$OpenBSD: le.4,v 1.6 2013/10/15 18:13:53 miod Exp $
-.\"
-.\" Copyright (c) 2003 Paul Weissmann
-.\" 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 REGENTS 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 REGENTS 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.
-.\"
-.Dd $Mdocdate: October 15 2013 $
-.Dt LE 4 aviion
-.Os
-.Sh NAME
-.Nm le
-.Nd AMD LANCE or ILACC Ethernet device
-.Sh SYNOPSIS
-.Cd "le0 at syscon? offset 0x8c000              " Pq "on-board, AV4000 family"
-.Cd "le0 at syscon? offset 0xb0100              " Pq "on-board, AV530 family"
-.Cd "le1 at syscon? offset 0xb0140              " Pq "on-board, AV530 family"
-.Pp
-.Cd "le* at vme? a32 0x00900000 a16 0x4000 ipl 3"
-.Cd "le* at vme? a32 0x55540000 a16 0x8600 ipl 3"
-.Cd "le* at vme? a32 0x55900000 a16 0x4000 ipl 3"
-.Cd "le* at vme? a32 0x55980000 a16 0x5000 ipl 3"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides access to the on-board AMD 7990/LANCE or AMD 79900/ILACC
-interface, as well as the VME Interphase 3207 Hawk Ethernet boards.
-This in turn provides an interface to the
-.Tn Ethernet
-network.
-.\" XXX this section needs a rework -- miod
-.\" .Sh HARDWARE CONFIGURATION
-.\" The card's base address
-.\" .Po
-.\" matching the
-.\" .Em addr
-.\" locator on the configuration line
-.\" .Pc
-.\" is defined through three sets of DIP switches,
-.\" .Dq SW1
-.\" and
-.\" .Dq SW2 ,
-.\" located in the middle of the board, near the space between the two
-.\" VME connectors, and
-.\" .Dq SW3 ,
-.\" closer to the AM7990DC chip at the bottom edge.
-.\" .Pp
-.\" The only supported configurations are:
-.\" .Bl -column "xxxxxxxx" "xxxxxxxx" "xxxxxxxx" "0xffffffff"
-.\" .It Li SW1 Ta SW2 Ta SW3 Ta Address
-.\" .It " "
-.\" .It Li "UUU_UU_U" Ta "U__U____" Ta "______U_" Ta "0xffff1200"
-.\" .It Li "UUU_U_UU" Ta "U__U_U__" Ta "______U_" Ta "0xffff1400"
-.\" .It Li "UUU_U__U" Ta "U__UU___" Ta "______U_" Ta "0xffff1600"
-.\" .It Li "U_U_U_UU" Ta "U__UUU__" Ta "______U_" Ta "0xffff5400"
-.\" .It Li "U_U_U__U" Ta "U_U_____" Ta "______U_" Ta "0xffff5600"
-.\" .It Li "_U_UU_UU" Ta "U_U__U__" Ta "______U_" Ta "0xffffa400"
-.\" .El
-.Sh SEE ALSO
-.Xr arp 4 ,
-.Xr inet 4 ,
-.Xr intro 4 ,
-.Xr netintro 4 ,
-.Xr vme 4 ,
-.Xr hostname.if 5 ,
-.Xr ifconfig 8
diff --git a/share/man/man4/man4.aviion/mem.4 b/share/man/man4/man4.aviion/mem.4
deleted file mode 100644
index 9d4df8c67d4..00000000000
--- a/share/man/man4/man4.aviion/mem.4
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$OpenBSD: mem.4,v 1.3 2013/10/15 18:13:53 miod Exp $
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This software was developed by the Computer Systems Engineering group
-.\" at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
-.\" contributed to Berkeley.
-.\"
-.\" 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.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-.\"
-.\"     from: @(#)mem.4	8.1 (Berkeley) 6/5/93
-.\"
-.Dd $Mdocdate: October 15 2013 $
-.Dt MEM 4 aviion
-.Os
-.Sh NAME
-.Nm mem ,
-.Nm kmem
-.Nd memory files
-.Sh DESCRIPTION
-The file
-.Pa /dev/mem
-is an interface to the physical memory of the
-computer.
-Byte offsets in this file are interpreted as physical memory addresses.
-Reading and writing this file is equivalent to reading and writing
-memory itself.
-An error will be returned if an attempt is made to reference
-an offset outside of
-.Pa /dev/mem .
-.Pp
-Kernel virtual memory is accessed via the file
-.Pa /dev/kmem
-in the same manner as
-.Pa /dev/mem .
-Only kernel virtual addresses that are currently mapped to memory are allowed.
-.Pp
-On the AViiON, physical memory is always contiguous;
-kernel virtual memory begins at
-.Ad 0x00000000 .
-.Pp
-Writeability of these devices is controlled by the system
-.Xr securelevel 7 .
-.Sh FILES
-.Bl -tag -width /dev/kmem -compact
-.It Pa /dev/mem
-.It Pa /dev/kmem
-.El
-.Sh SEE ALSO
-.Xr securelevel 7
-.Sh HISTORY
-The
-.Pa /dev/mem
-and
-.Pa /dev/kmem
-files appeared in
-.At v6 .
diff --git a/share/man/man4/man4.aviion/nvram.4 b/share/man/man4/man4.aviion/nvram.4
deleted file mode 100644
index d5d1ee5886f..00000000000
--- a/share/man/man4/man4.aviion/nvram.4
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"	$OpenBSD: nvram.4,v 1.2 2013/10/15 20:34:47 jmc Exp $
-.\"
-.\" Copyright (c) 2013 Miodrag Vallat.
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: October 15 2013 $
-.Dt NVRAM 4 aviion
-.Os
-.Sh NAME
-.Nm nvram
-.Nd Mostek MK48T0x battery-backed realtime clock
-.Sh SYNOPSIS
-.Cd "nvram0  at syscon0 offset 0x80000"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the
-Mostek MK48T02 realtime clock chip.
-.Pp
-In addition to the clock itself, this chip embeds 2KB
-of battery-backed memory, which is accessible through the special
-.Pa /dev/nvram0
-file.
-.Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /dev/nvram0
-.El
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr syscon 4
-.Sh CAVEATS
-The last 8 bytes of the battery-backed memory contains the realtime clock
-registers.
-Writing to these locations will interfere with proper clock operation.
-.Pp
-Most, if not all, of the battery-backed memory is used by DG/UX to store
-some of its configuration data, and may be reinitialized by the PROM
-if it considers the memory contents as invalid.
-The
-.Nm
-driver does not prevent access to this reserved part.
diff --git a/share/man/man4/man4.aviion/oaic.4 b/share/man/man4/man4.aviion/oaic.4
deleted file mode 100644
index c8fe2dbebbe..00000000000
--- a/share/man/man4/man4.aviion/oaic.4
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"	$OpenBSD: oaic.4,v 1.2 2013/10/15 18:13:53 miod Exp $
-.\"	OpenBSD: aic.4,v 1.8 2012/08/14 01:08:19 dlg Exp
-.\"	$NetBSD: aic.4,v 1.5 1998/06/07 09:08:45 enami Exp $
-.\"
-.\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
-.\" Copyright (c) 1994 James A. Jegers
-.\" 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. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
-.\"
-.\"
-.Dd $Mdocdate: October 15 2013 $
-.Dt OAIC 4 aviion
-.Os
-.Sh NAME
-.Nm oaic
-.Nd Adaptec AIC-6250 SCSI interface
-.Sh SYNOPSIS
-.Cd "oaic0 at syscon? offset 0x8a000"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the
-.Tn Adaptec
-AIC-6250
-.Tn SCSI
-controller chips.
-.Sh SEE ALSO
-.Xr cd 4 ,
-.Xr ch 4 ,
-.Xr intro 4 ,
-.Xr scsi 4 ,
-.Xr sd 4 ,
-.Xr st 4 ,
-.Xr syscon 4 ,
-.Xr uk 4
diff --git a/share/man/man4/man4.aviion/syscon.4 b/share/man/man4/man4.aviion/syscon.4
deleted file mode 100644
index 27d51606792..00000000000
--- a/share/man/man4/man4.aviion/syscon.4
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"	$OpenBSD: syscon.4,v 1.2 2013/10/15 20:34:47 jmc Exp $
-.\"
-.\" Copyright (c) 2008 Miodrag Vallat.
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies. And
-.\" I won't mind if you keep the disclaimer below.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: October 15 2013 $
-.Dt SYSCON 4 aviion
-.Os
-.Sh NAME
-.Nm syscon
-.Nd VME system controller
-.Sh SYNOPSIS
-.Cd "syscon0 at mainbus0 addr 0xfff00000"
-.Cd "nvram0  at syscon0 offset 0x80000"
-.Cd "dart0   at syscon0 offset 0x82000"
-.Cd "dart1   at syscon0 offset 0x82c00"
-.Cd "vme0    at syscon0 offset 0x85000"
-.Cd "oaic0   at syscon0 offset 0x8a000"
-.Cd "le0     at syscon0 offset 0x8c000"
-.Cd "oosiop0 at syscon0 offset 0xb0000"
-.Cd "oosiop1 at syscon0 offset 0xb0080"
-.Cd "le0     at syscon0 offset 0xb0100"
-.Cd "le1     at syscon0 offset 0xb0140"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides an interface to the different local bus-attached I/O
-devices found on AViiON systems.
-.Pp
-The devices which may be connected to
-.Nm
-are:
-.Pp
-.Bl -tag -compact -width 9n -offset indent
-.It Xr dart 4
-MC68681 or MC68692 dual UART
-.It Xr le 4
-AMD LANCE or ILACC Ethernet device
-.It Xr nvram 4
-Mostek MK48T0x battery-backed realtime clock
-.It Xr oaic 4
-Adaptec AIC-6250 SCSI interface
-.It Xr oosiop 4
-Symbios/NCR 53C700 SCSI driver
-.It Xr vme 4
-VMEbus interface
-.El
-.Sh SEE ALSO
-.Xr intro 4
diff --git a/share/man/man4/man4.aviion/vme.4 b/share/man/man4/man4.aviion/vme.4
deleted file mode 100644
index 6c4e39a454a..00000000000
--- a/share/man/man4/man4.aviion/vme.4
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"	$OpenBSD: vme.4,v 1.2 2013/10/15 20:34:47 jmc Exp $
-.\"
-.\" Copyright (c) 2003 Paul Weissmann
-.\" 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 REGENTS 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 REGENTS 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.
-.\"
-.Dd $Mdocdate: October 15 2013 $
-.Dt VME 4 aviion
-.Os
-.Sh NAME
-.Nm vme
-.Nd VMEbus interface
-.Sh SYNOPSIS
-.Cd "vme0   at syscon0    offset 0x85000"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides access to the VMEbus, operating the VMEbus part of the
-.Xr syscon 4
-device.
-.Pp
-The currently supported VMEbus drivers are:
-.Pp
-.Bl -tag -compact -width 10n -offset indent
-.It Xr le 4
-AMD LANCE or ILACC Ethernet device
-.\" .It Xr vs 4
-.\" MVME328, MVME328S and MVME328XT high performance SCSI controller
-.\" .It Xr vsbic 4
-.\" MVME327A SCSI and floppy controller
-.\" .It Xr vx 4
-.\" MVME332XT high performance serial I/O controller
-.El
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr syscon 4
diff --git a/share/man/man4/oosiop.4 b/share/man/man4/oosiop.4
index 5fd545e64dc..ef2d143cff1 100644
--- a/share/man/man4/oosiop.4
+++ b/share/man/man4/oosiop.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: oosiop.4,v 1.9 2013/10/22 21:56:03 miod Exp $
+.\"	$OpenBSD: oosiop.4,v 1.10 2015/12/01 07:50:05 deraadt Exp $
 .\"	$NetBSD: osiop.4,v 1.2 2001/09/22 01:44:55 wiz Exp $
 .\"
 .\" Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -25,17 +25,13 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 22 2013 $
+.Dd $Mdocdate: December 1 2015 $
 .Dt OOSIOP 4
 .Os
 .Sh NAME
 .Nm oosiop
 .Nd Symbios/NCR 53C700 SCSI driver
 .Sh SYNOPSIS
-.Cd "# aviion"
-.Cd "oosiop0 at syscon? offset 0xb0000"
-.Cd "oosiop1 at syscon? offset 0xb0080"
-.Pp
 .Cd "# hppa"
 .Cd "oosiop* at gsc? irq 9"
 .Sh DESCRIPTION
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 4133c12a00c..c833b65503a 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.88 2014/03/18 22:36:31 miod Exp $
+#	$OpenBSD: Makefile,v 1.89 2015/12/01 07:50:05 deraadt Exp $
 #	$NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
@@ -13,7 +13,7 @@ MLINKS+=daily.8 weekly.8 daily.8 monthly.8
 MLINKS+=rc.8 rc.firsttime.8 rc.8 rc.local.8 rc.8 rc.securelevel.8
 MLINKS+=rc.conf.8 rc.conf.local.8
 
-SUBDIR=	man8.alpha man8.amd64 man8.armish man8.armv7 man8.aviion \
+SUBDIR=	man8.alpha man8.amd64 man8.armish man8.armv7 \
 	man8.hppa man8.hppa64 man8.i386 man8.landisk \
 	man8.loongson man8.luna88k man8.macppc \
 	man8.octeon man8.sgi man8.socppc man8.sparc man8.sparc64 man8.vax \
diff --git a/share/man/man8/man8.aviion/MAKEDEV.8 b/share/man/man8/man8.aviion/MAKEDEV.8
deleted file mode 100644
index b93122f8bcf..00000000000
--- a/share/man/man8/man8.aviion/MAKEDEV.8
+++ /dev/null
@@ -1,176 +0,0 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.23 2015/10/23 15:18:01 claudio Exp $
-.\"
-.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-.\" generated from:
-.\"
-.\"	OpenBSD: etc.aviion/MAKEDEV.md,v 1.21 2015/10/23 15:14:11 claudio Exp 
-.\"	OpenBSD: MAKEDEV.common,v 1.79 2015/10/23 15:14:11 claudio Exp 
-.\"	OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
-.\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
-.\"
-.\" Copyright (c) 2004, Miodrag Vallat
-.\" Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: October 23 2015 $
-.Dt MAKEDEV 8 aviion
-.Os
-.Sh NAME
-.Nm MAKEDEV
-.Nd create system and device special files
-.Sh SYNOPSIS
-.Nm MAKEDEV
-.Ar name ...
-.Sh DESCRIPTION
-The shell script
-.Nm ,
-found in the
-.Pa /dev
-directory, is used to create various special files.
-See
-.Xr intro 4
-for a more complete discussion of special files.
-.Pp
-.Nm
-takes any number of device names as arguments, where the names are
-the common abbreviation for the device or group of devices.
-.Pp
-Where a device name is followed by a star
-.Sq * ,
-the star must be replaced by a unit number.
-If units are expected for a device but not provided,
-.Nm
-will supply the standard numbers in most cases.
-.Pp
-The aviion supports the following devices:
-.Pp
-.Sy Special device names
-.Bl -tag -width tenletters -compact
-.It Ar all
-Creates special files for all devices on aviion.
-.It Ar ramdisk
-Ramdisk kernel devices.
-.It Ar std
-Creates the
-.Sq standard
-devices (console, klog, kmem, ksyms, mem, null,
-stderr, stdin, stdout, tty, zero)
-which are absolutely necessary for the system to function properly.
-.It Ar local
-Creates configuration-specific devices, by invoking the shell file
-.Pa MAKEDEV.local .
-.El
-.Pp
-.Sy Disks
-.Bl -tag -width tenletters -compact
-.It Ar cd*
-ATAPI and SCSI CD-ROM drives, see
-.Xr cd 4 .
-.It Ar rd*
-.Dq rd
-pseudo-disks, see
-.Xr rd 4 .
-.It Ar sd*
-SCSI disks, including flopticals, see
-.Xr sd 4 .
-.It Ar vnd*
-.Dq file
-pseudo-disk devices, see
-.Xr vnd 4 .
-.El
-.Pp
-.Sy Tapes
-.Bl -tag -width tenletters -compact
-.It Ar ch*
-SCSI media changers, see
-.Xr ch 4 .
-.It Ar st*
-SCSI tape drives, see
-.Xr st 4 .
-.El
-.Pp
-.Sy Terminal ports
-.Bl -tag -width tenletters -compact
-.It Ar ttya-c
-on-board serial and mouse ports, see
-.Xr dart 4 .
-.El
-.Pp
-.Sy Pseudo terminals
-.Bl -tag -width tenletters -compact
-.It Ar ptm
-pty master device, see
-.Xr ptm 4 .
-.It Ar pty*
-Set of 62 master pseudo terminals, see
-.Xr pty 4 .
-.It Ar tty*
-Set of 62 slave pseudo terminals, see
-.Xr tty 4 .
-.El
-.Pp
-.Sy Special purpose devices
-.Bl -tag -width tenletters -compact
-.It Ar bio
-ioctl tunnel pseudo-device, see
-.Xr bio 4 .
-.It Ar bpf*
-Berkeley Packet Filter, see
-.Xr bpf 4 .
-.It Ar diskmap
-Disk mapper, see
-.Xr diskmap 4 .
-.It Ar fd
-fd/* nodes, see
-.Xr fd 4 .
-.It Ar fuse
-Userland Filesystem, see
-.Xr fuse 4 .
-.It Ar nvram0
-On-board non-volatile memory, see
-.Xr nvram 4 .
-.It Ar pf*
-Packet Filter, see
-.Xr pf 4 .
-.It Ar pppx*
-PPP Multiplexer, see
-.Xr pppx 4 .
-.It Ar *random
-In-kernel random data source, see
-.Xr random 4 .
-.It Ar systrace*
-System call tracing device, see
-.Xr systrace 4 .
-.It Ar tun*
-Network tunnel driver, see
-.Xr tun 4 .
-.It Ar tap*
-Ethernet tunnel driver, see
-.Xr tap 4 .
-.It Ar uk*
-Unknown SCSI devices, see
-.Xr uk 4 .
-.It Ar vscsi*
-Virtual SCSI controller, see
-.Xr vscsi 4 .
-.El
-.Sh FILES
-.Bl -tag -width /dev -compact
-.It Pa /dev
-The special file directory.
-.El
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr config 8 ,
-.Xr mknod 8
diff --git a/share/man/man8/man8.aviion/Makefile b/share/man/man8/man8.aviion/Makefile
deleted file mode 100644
index a71b294d92b..00000000000
--- a/share/man/man8/man8.aviion/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2006/05/09 21:24:47 miod Exp $
-
-MAN=	MAKEDEV.8
-MANSUBDIR=aviion
-
-.include <bsd.prog.mk>