armish handled some early-gen arm machines, which required tons of

workarounds.  Some of them will soon stand in the way of armv7.
Off to the attic you go.

11 files changed, 10 insertions, 512 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 0f084e7ff3b..4ec5707fdfa 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.629 2016/08/03 22:46:44 jcs Exp $
+#	$OpenBSD: Makefile,v 1.630 2016/08/10 14:27:16 deraadt Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpials.4 acpiasus.4 acpibat.4 \
@@ -80,7 +80,7 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	xe.4 xen.4 xf86.4 xge.4 xhci.4 xl.4 xmphy.4 xnf.4 xspd.4 \
 	yds.4 ym.4 zero.4 zyd.4
 
-SUBDIR=	man4.alpha man4.amd64 man4.armish man4.armv7 \
+SUBDIR=	man4.alpha man4.amd64 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.zaurus
diff --git a/share/man/man4/com.4 b/share/man/man4/com.4
index 2b61f4657d1..e6c7473151f 100644
--- a/share/man/man4/com.4
+++ b/share/man/man4/com.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: com.4,v 1.36 2016/04/10 04:04:26 visa Exp $
+.\"	$OpenBSD: com.4,v 1.37 2016/08/10 14:27:16 deraadt Exp $
 .\"	$NetBSD: com.4,v 1.5 1996/03/16 00:07:08 thorpej Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"
-.Dd $Mdocdate: April 10 2016 $
+.Dd $Mdocdate: August 10 2016 $
 .Dt COM 4
 .Os
 .Sh NAME
@@ -62,9 +62,6 @@
 .Cd "com0 at isa? port 0x3f8 irq 4"
 .Cd "com1 at isa? port 0x2f8 irq 3"
 .Pp
-.Cd "# armish"
-.Cd "com0 at obio? addr 0xfe800000 xint 3"
-.Pp
 .Cd "# hppa"
 .Cd "com0 at gsc? offset 0x5000 irq 5"
 .Cd "com0 at gsc? offset 0x823000 irq 5"
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index a04c1918e8f..f6036ba0b64 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iic.4,v 1.86 2016/05/16 14:58:29 kettenis Exp $
+.\"	$OpenBSD: iic.4,v 1.87 2016/08/10 14:27:16 deraadt Exp $
 .\"
 .\" Copyright (c) 2004, 2006 Alexander Yurchenko <grange@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 16 2016 $
+.Dd $Mdocdate: August 10 2016 $
 .Dt IIC 4
 .Os
 .Sh NAME
@@ -30,7 +30,6 @@
 .Cd "iic* at glxpcib?               # i386"
 .Cd "iic* at gscsio?                # i386"
 .Cd "iic* at ichiic?                # amd64 i386"
-.Cd "iic* at iopiic?                # armish"
 .Cd "iic* at nviic?                 # amd64 i386"
 .Cd "iic* at pcfiic?                # sparc64"
 .Cd "iic* at piixpm?                # amd64 i386"
diff --git a/share/man/man4/man4.armish/Makefile b/share/man/man4/man4.armish/Makefile
deleted file mode 100644
index 084fd88fc79..00000000000
--- a/share/man/man4/man4.armish/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2016/03/30 06:38:44 jmc Exp $
-
-# TODO: aupxa(eventually) cpu
-MAN=	autoconf.4 intro.4 mem.4 
-
-MANSUBDIR=armish
-
-.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.armish/autoconf.4 b/share/man/man4/man4.armish/autoconf.4
deleted file mode 100644
index 28a1b0a2f18..00000000000
--- a/share/man/man4/man4.armish/autoconf.4
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"	$OpenBSD: autoconf.4,v 1.2 2007/05/31 19:19:53 jmc Exp $
-.\"
-.\" Copyright (c) 1994 Christopher G. Demetriou
-.\" 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. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Christopher G. Demetriou.
-.\" 3. 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: May 31 2007 $
-.Dt AUTOCONF 4 armish
-.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, mass storage, 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 usually not detected.
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr boot_armish 8 ,
-.Xr config 8
diff --git a/share/man/man4/man4.armish/intro.4 b/share/man/man4/man4.armish/intro.4
deleted file mode 100644
index 7388faf8dba..00000000000
--- a/share/man/man4/man4.armish/intro.4
+++ /dev/null
@@ -1,112 +0,0 @@
-.\"	$OpenBSD: intro.4,v 1.9 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.
-.\"
-.Dd $Mdocdate: September 19 2014 $
-.Dt INTRO 4 armish
-.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 armish 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
-A complete list of available devices is contained within the pages
-describing the system buses and controllers.
-For example, a PCI device would be listed in the
-.Xr pci 4
-man page.
-The following buses and controllers list these devices:
-.Pp
-.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
-.It Xr iic 4
-Inter IC (I2C) bus
-.It Xr onewire 4
-1-Wire bus
-.It Xr pci 4
-introduction to PCI bus support
-.It Xr usb 4
-introduction to Universal Serial Bus support
-.El
-.Sh SEE ALSO
-.Xr autoconf 4 ,
-.Xr config 8
-.Sh HISTORY
-The
-armish
-.Nm intro
-first appeared in
-.Ox 4.0 .
diff --git a/share/man/man4/man4.armish/mem.4 b/share/man/man4/man4.armish/mem.4
deleted file mode 100644
index 05309050141..00000000000
--- a/share/man/man4/man4.armish/mem.4
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"	$OpenBSD: mem.4,v 1.2 2007/05/31 19:19:53 jmc Exp $
-.\"
-.\" Copyright (c) 1991 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: @(#)mem.4	5.3 (Berkeley) 5/2/91
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt MEM 4 armish
-.Os
-.Sh NAME
-.Nm mem ,
-.Nm kmem
-.Nd memory files
-.Sh DESCRIPTION
-The special 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.
-Only offsets within the bounds of
-.Pa /dev/mem
-are allowed.
-.Pp
-Kernel virtual memory is accessed through the interface
-.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 armish, physical memory is contiguous.
-The kernel virtual memory begins at address
-.Li 0xc0000000 .
-.Pp
-Writeability of these devices is controlled by the system
-.Xr securelevel 7 .
-.Sh FILES
-.Bl -tag -width Pa -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/pci.4 b/share/man/man4/pci.4
index ae7ceb0a431..2eeb3243e04 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pci.4,v 1.350 2016/08/09 23:27:33 czarkoff Exp $
+.\"	$OpenBSD: pci.4,v 1.351 2016/08/10 14:27:16 deraadt Exp $
 .\"	$NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" (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: August 9 2016 $
+.Dd $Mdocdate: August 10 2016 $
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -49,9 +49,6 @@
 .Cd "# amd64, i386"
 .Cd "pci* at mainbus0"
 .Pp
-.Cd "# armish"
-.Cd "pci* at iopxs0"
-.Pp
 .Cd "# hppa"
 .Cd "pci* at dino?"
 .Cd "pci* at elroy?"
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 4c465e2fe54..cc1f56af58d 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.93 2016/05/11 21:52:49 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.94 2016/08/10 14:27:16 deraadt Exp $
 #	$NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
@@ -8,7 +8,7 @@ MAN=	afterboot.8 autoinstall.8 boot_config.8 \
 	rc.conf.8 rc.d.8 rc.shutdown.8 rc.subr.8 release.8 \
 	security.8 ssl.8 starttls.8 sticky.8 yp.8
 
-SUBDIR=	man8.alpha man8.amd64 man8.armish man8.armv7 \
+SUBDIR=	man8.alpha man8.amd64 man8.armv7 \
 	man8.hppa man8.i386 man8.landisk \
 	man8.loongson man8.luna88k man8.macppc \
 	man8.octeon man8.sgi man8.socppc man8.sparc man8.sparc64 \
diff --git a/share/man/man8/man8.armish/MAKEDEV.8 b/share/man/man8/man8.armish/MAKEDEV.8
deleted file mode 100644
index 32834aa911a..00000000000
--- a/share/man/man8/man8.armish/MAKEDEV.8
+++ /dev/null
@@ -1,242 +0,0 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.45 2016/04/28 18:17:31 natano Exp $
-.\"
-.\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-.\" generated from:
-.\"
-.\"	OpenBSD: etc.armish/MAKEDEV.md,v 1.36 2016/04/25 20:38:10 tedu Exp 
-.\"	OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp 
-.\"	OpenBSD: MAKEDEV.man,v 1.8 2016/03/12 17:59:27 espie 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: April 28 2016 $
-.Dt MAKEDEV 8 armish
-.Os
-.Sh NAME
-.Nm MAKEDEV
-.Nd create system and device special files
-.Sh SYNOPSIS
-.Nm MAKEDEV
-.Op 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 armish supports the following devices:
-.Pp
-.Sy Special device names
-.Bl -tag -width tenletters -compact
-.It Ar all
-Creates special files for all devices on armish.
-.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 ch*
-SCSI media changers, see
-.Xr ch 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 .
-.It Ar wd*
-.Dq winchester
-disk drives (ST506, IDE, ESDI, RLL, ...), see
-.Xr wd 4 .
-.El
-.Pp
-.Sy Tapes
-.Bl -tag -width tenletters -compact
-.It Ar st*
-SCSI tape drives, see
-.Xr st 4 .
-.El
-.Pp
-.Sy Terminal ports
-.Bl -tag -width tenletters -compact
-.It Ar tty[0-7][0-9a-f]
-NS16x50 serial ports, see
-.Xr com 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 Console ports
-.Bl -tag -width tenletters -compact
-.It Ar ttyC-J*
-wscons display devices, see
-.Xr wsdisplay 4 .
-.It Ar wscons
-Minimal wscons devices, see
-.Xr wscons 4 .
-.It Ar wskbd*
-wscons keyboards, see
-.Xr wskbd 4 .
-.It Ar wsmouse*
-wscons mice, see
-.Xr wsmouse 4 .
-.It Ar wsmux
-wscons keyboard/mouse mux devices, see
-.Xr wsmux 4 .
-.El
-.Pp
-.Sy USB devices
-.Bl -tag -width tenletters -compact
-.It Ar ttyU*
-USB serial ports, see
-.Xr ucom 4 .
-.It Ar uall
-All USB devices, see
-.Xr usb 4 .
-.It Ar ugen*
-Generic USB devices, see
-.Xr ugen 4 .
-.It Ar uhid*
-Generic HID devices, see
-.Xr uhid 4 .
-.It Ar ulpt*
-Printer devices, see
-.Xr ulpt 4 .
-.It Ar usb*
-Bus control devices used by usbd for attach/detach, see
-.Xr usb 4 .
-.El
-.Pp
-.Sy Special purpose devices
-.Bl -tag -width tenletters -compact
-.It Ar apm
-Power management device, see
-.Xr apm 4 .
-.It Ar audio*
-Audio devices, see
-.Xr audio 4 .
-.It Ar bio
-ioctl tunnel pseudo-device, see
-.Xr bio 4 .
-.It Ar bktr*
-Video frame grabbers, see
-.Xr bktr 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 hotplug
-devices hot plugging, see
-.Xr hotplug 4 .
-.It Ar pci*
-PCI bus devices, see
-.Xr pci 4 .
-.It Ar pf*
-Packet Filter, see
-.Xr pf 4 .
-.It Ar pppx*
-PPP Multiplexer, see
-.Xr pppx 4 .
-.It Ar radio*
-FM tuner devices, see
-.Xr radio 4 .
-.It Ar *random
-In-kernel random data source, see
-.Xr random 4 .
-.It Ar rmidi*
-Raw MIDI devices, see
-.Xr midi 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 tuner*
-Tuner devices, see
-.Xr bktr 4 .
-.It Ar video*
-Video V4L2 devices, see
-.Xr video 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.armish/Makefile b/share/man/man8/man8.armish/Makefile
deleted file mode 100644
index 4469dfede7d..00000000000
--- a/share/man/man8/man8.armish/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2006/06/06 00:01:50 drahn Exp $
-
-MAN=	MAKEDEV.8 
-MANSUBDIR=armish
-
-.include <bsd.prog.mk>