sun4e bits

19 files changed, 80 insertions, 86 deletions

diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index fdb5f1aa999..5419c5bd4e2 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.76 2010/02/23 15:52:33 jasper Exp $
+dnl	$OpenBSD: hardware,v 1.77 2010/07/10 19:38:36 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
     * sun4: the VME series
 	- 4/100: Original SPARC with VME. Many hardware bugs.
@@ -17,6 +17,10 @@ OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- IPX: SS2 in a cube, with cgsix graphics builtin
 	- ELC: SS2-performance built into a B&W monitor
 
+    * sun4e:
+	- SPARCengine 1E: a 6U VME cross between a sun4 and a sun4c,
+	  similar to a Sun 4/300 with an OpenPROM interface.
+
     * sun4m:
 	- 600MP: The original Sun4m machine. This is an mbus machine with
 	  SBus and VME busses.
@@ -153,10 +157,10 @@ Supported devices {:-include-:}:
 	- SBus 10/100MBit hme Ethernet cards (hme) [*]
 	- SBus 10/100MBit SunSwift SUNW,fas Ethernet+SCSI cards (hme) [*]
 	- SBus Quad 10/100MBit hme and qfe Ethernet cards (hme) [*]
-	[*] Not supported in sun4c-class machines due to PROM limitations.
+	[*] Not supported in sun4c and sun4e machines due to PROM limitations.
 
     * SCSI controllers:
-	- on-board SCSI controller (sun4c, sun4m, and 4/300) (esp)
+	- on-board SCSI controller (sun4c, sun4e, sun4m, and 4/300) (esp)
 	- SBus SCSI controllers (including 3rd party compatible boards) (esp)
 	- SBus cards containing both AMD Lance le and esp SCSI (esp)
 	- SBus SUNW,fas Ethernet+SCSI cards (esp) [*]
@@ -164,7 +168,7 @@ Supported devices {:-include-:}:
 	- 4/110 "SCSI weird" on-board controller (polled DMA) (sw)
 	- QSP/ISP SCSI controllers (i.e. "PTI,ptisp", "ptisp", "SUNW,isp"
 	  and "QLGC,isp") (isp)
-	[*] Not supported in sun4c-class machines due to PROM limitations.
+	[*] Not supported in sun4c and sun4e machines due to PROM limitations.
 
     * SMD and other disk controllers:
 	- Xylogics 7053 VME SMD disk controller (xd)
@@ -333,4 +337,4 @@ Hardware that we do NOT currently support, but get many questions about:
     * SBus FDDI cards
 
 The supplied GENERIC kernel is the best attempt at a configuration that
-works on the widest range of machines (sun4, sun4c, and sun4m).
+works on the widest range of machines (sun4, sun4c, sun4e and sun4m).
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 99663bce385..82d598e310f 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.70 2010/03/16 17:23:09 miod Exp $
+dnl	$OpenBSD: install,v 1.71 2010/07/10 19:38:37 miod Exp $
 OpenBSDInstallPrelude({:-SMD disks-:})
 
 There are several ways to install OpenBSD onto a disk.  The normal way
@@ -423,25 +423,15 @@ Normally, this file is a symbolic link to an appropriate second-stage
 boot program, which should be located in a place where the TFTP daemon
 can find it (remember, many TFTP daemons run in a chroot'ed environment).
 
-You can find the boot program in `/usr/mdec/boot' in the OpenBSD/MACHINE
-distribution. Unfortunately, it is necessary to install this file
-differently for sun4 and sun4c clients: the sun4 version needs to have its
-`a.out' header stripped off (otherwise the machine will crash), while the
-sun4c version must retain it (otherwise the PROM will complain).
-
-Here's an example to illustrate this whole mess:
-
-    server# cd /<client-root-dir>/usr/mdec
-    if client is a sun4:
-	server# set SKIP=1
-	server# set KARCH=SUN4
-    else
-	server# set SKIP=0
-	server# set KARCH=SUN4C
-    server{:-#-:} dd if=boot of=/tftpboot/boot.MACHINE.OpenBSD.$KARCH skip=$SKIP bs=32
-    server# cd /tftpboot
-    server{:-#-:} ln -s boot.MACHINE.OpenBSD.$KARCH 8273900B.$KARCH
+As an exception to the above rule, sun4e systems make a request for
+`/tftpboot/IP_IN_HEX.SUN4E', i.e. the TFTP filename is in a subdirectory.
 
+You can find the boot program as `boot.net' in the OpenBSD/MACHINE
+distribution. Unfortunately, many, if not all, sun4e PROM have a bug and
+fail to load a file which size is a multiple of 512 bytes. If you are
+trying to netboot a sun4e system, simply append some bytes to the
+file, like this:
+	dd if=/dev/zero bs=32b count=1 >> boot.net
 
 After the boot program has been loaded into memory and given control by
 the PROM, it starts locating the machine's remote root directory through
diff --git a/distrib/notes/sparc/prep b/distrib/notes/sparc/prep
index 31127a4e347..db0b5295553 100644
--- a/distrib/notes/sparc/prep
+++ b/distrib/notes/sparc/prep
@@ -46,16 +46,16 @@ prevent accidents if you change the SCSI bus configuration or a drive
 is down.
 
 Your OpenBOOT ROM may need some setup.  If you are running OpenBSD on
-a sun4c, or sun4m system, the ROM must be set to "new" command mode.
-If your sun4c or sun4m machine comes up and gives you a `>' prompt
-instead of `ok', type:
+a sun4c, sun4e or sun4m system, the ROM must be set to "new" command
+mode.  If your machine comes up and gives you a `>' prompt instead of
+`ok', type:
 
-    >n
+    > n
     ok setenv sunmon-compat? false
     ok
 
 This is needed because OpenBSD relies on the behaviour of the "new" command
-mode.  OpenBSD will not boot correctly on sun4c or sun4m systems that
+mode.  OpenBSD will not boot correctly on sun4c, sun4e or sun4m systems that
 are not running in "new" command mode.  The sun4 systems such as the 4/110,
 4/200, and 4/300 system do not have a "new" command mode, and will work
 fine as-is.
diff --git a/share/man/man4/man4.sparc/auxreg.4 b/share/man/man4/man4.sparc/auxreg.4
index 10246751188..7efc27b2e0a 100644
--- a/share/man/man4/man4.sparc/auxreg.4
+++ b/share/man/man4/man4.sparc/auxreg.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: auxreg.4,v 1.3 2007/05/31 19:19:56 jmc Exp $
+.\"     $OpenBSD: auxreg.4,v 1.4 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,14 +24,14 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt AUXREG 4 sparc
 .Os
 .Sh NAME
 .Nm auxreg
 .Nd SPARC auxiliary register
 .Sh SYNOPSIS
-.Cd "auxreg0 at mainbus0                          " Pq "sun4c"
+.Cd "auxreg0 at mainbus0                          " Pq "sun4c and sun4e"
 .Cd "auxreg0 at obio0                             " Pq "sun4m"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/man4.sparc/be.4 b/share/man/man4/man4.sparc/be.4
index 42922282912..983a60d94e7 100644
--- a/share/man/man4/man4.sparc/be.4
+++ b/share/man/man4/man4.sparc/be.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: be.4,v 1.19 2008/03/31 07:44:30 jmc Exp $
+.\"     $OpenBSD: be.4,v 1.20 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,15 +24,15 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2008 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt BE 4 sparc
 .Os
 .Sh NAME
 .Nm be
 .Nd SPARC 10/100 Ethernet device
 .Sh SYNOPSIS
-.Cd "qec* at sbus? " Pq "sun4c/sun4m"
-.Cd "be* at qec?   " Pq "sun4c/sun4m"
+.Cd "qec* at sbus? " Pq "sun4c/sun4e/sun4m"
+.Cd "be* at qec?   " Pq "sun4c/sun4e/sun4m"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.sparc/bpp.4 b/share/man/man4/man4.sparc/bpp.4
index d460e48b78e..46e66856e5c 100644
--- a/share/man/man4/man4.sparc/bpp.4
+++ b/share/man/man4/man4.sparc/bpp.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: bpp.4,v 1.3 2007/05/31 19:19:56 jmc Exp $
+.\"     $OpenBSD: bpp.4,v 1.4 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,14 +24,14 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt BPP 4 sparc
 .Os
 .Sh NAME
 .Nm bpp
 .Nd SPARC bi-directional parallel port
 .Sh SYNOPSIS
-.Cd "bpp at sbus? " Pq "sun4c/sun4m"
+.Cd "bpp at sbus? " Pq "sun4c/sun4e/sun4m"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.sparc/bwtwo.4 b/share/man/man4/man4.sparc/bwtwo.4
index 6728130bec1..8577811001a 100644
--- a/share/man/man4/man4.sparc/bwtwo.4
+++ b/share/man/man4/man4.sparc/bwtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bwtwo.4,v 1.27 2010/06/07 19:54:30 miod Exp $
+.\"	$OpenBSD: bwtwo.4,v 1.28 2010/07/10 19:38:39 miod Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -33,7 +33,7 @@
 .\"	from: Header: bwtwo.4,v 1.3 94/02/03 20:42:13 leres Exp
 .\"     from: @(#)bwtwo.4	8.2 (Berkeley) 2/16/94
 .\"
-.Dd $Mdocdate: June 7 2010 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt BWTWO 4 sparc
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nd monochromatic frame buffer
 .Sh SYNOPSIS
 .Cd "bwtwo0 at sbus0                        " Pq "sun4c on-board"
-.Cd "bwtwo* at sbus?                        " Pq "sun4c and sun4m"
+.Cd "bwtwo* at sbus?                        " Pq "sun4c/sun4e/sun4m"
 .Cd "bwtwo0 at obio0 addr 0xfd000000 level 4" Pq sun4/200
 .Cd "bwtwo0 at obio0 addr 0xfb300000 level 4" Pq "sun4/100 and sun 4/300 P4"
 .Cd "wsdisplay* at bwtwo?"
@@ -50,7 +50,7 @@ The
 .Nm
 is a black and white frame buffer commonly encountered
 as the on-board frame buffer on sun4 and some sun4c class workstations.
-It is also available as an SBus card for sun4c and sun4m, or as a P4 bus
+It is also available as an SBus card for sun4c, sun4e and sun4m, or as a P4 bus
 card for sun4 workstations.
 .Pp
 The
diff --git a/share/man/man4/man4.sparc/cgsix.4 b/share/man/man4/man4.sparc/cgsix.4
index 15996e197ac..334d3dea4e0 100644
--- a/share/man/man4/man4.sparc/cgsix.4
+++ b/share/man/man4/man4.sparc/cgsix.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgsix.4,v 1.32 2010/06/07 19:54:30 miod Exp $
+.\"	$OpenBSD: cgsix.4,v 1.33 2010/07/10 19:38:39 miod Exp $
 .\"	$NetBSD: cgsix.4,v 1.4 1998/06/11 08:32:20 fair Exp $
 .\"
 .\" Copyright 1994
@@ -34,21 +34,21 @@
 .\"
 .\"	from: @(#)cgsix.4	8.1 (Berkeley) 2/16/94
 .\"
-.Dd $Mdocdate: June 7 2010 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt CGSIX 4 sparc
 .Os
 .Sh NAME
 .Nm cgsix
 .Nd accelerated 8-bit color frame buffer
 .Sh SYNOPSIS
-.Cd "cgsix* at sbus?                        " Pq "sun4c and sun4m"
+.Cd "cgsix* at sbus?                        " Pq "sun4c/sun4e/sun4m"
 .Cd "cgsix0 at obio0 addr 0xfb000000 level 4" Pq "sun4/100 and sun4/300 P4"
 .Cd "wsdisplay* at cgsix?"
 .Sh DESCRIPTION
 The
 .Nm
 is a color frame buffer with graphics acceleration,
-available as an SBus card for sun4c and sun4m, or as a P4 bus
+available as an SBus card for sun4c, sun4e and sun4m, or as a P4 bus
 card for sun4 workstations.
 .Pp
 The
diff --git a/share/man/man4/man4.sparc/clock.4 b/share/man/man4/man4.sparc/clock.4
index 6aa3412a3db..1a87569beb6 100644
--- a/share/man/man4/man4.sparc/clock.4
+++ b/share/man/man4/man4.sparc/clock.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: clock.4,v 1.5 2010/06/07 19:54:30 miod Exp $
+.\"     $OpenBSD: clock.4,v 1.6 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 2004 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,15 +24,15 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 7 2010 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt CLOCK 4 sparc
 .Os
 .Sh NAME
 .Nm clock
 .Nd SPARC clock driver
 .Sh SYNOPSIS
-.Cd "clock0 at mainbus0               # sun4c"
-.Cd "clock0 at obio0                  # sun4m"
+.Cd "clock0  at mainbus0               # sun4c and sun4e"
+.Cd "clock0  at obio0                  # sun4m"
 .Cd "clock0  at obio0 addr 0xf2000000 # sun4/300"
 .Cd "oclock0 at obio0 addr 0xf3000000 # sun4/100 and sun4/200"
 .Sh DESCRIPTION
diff --git a/share/man/man4/man4.sparc/esp.4 b/share/man/man4/man4.sparc/esp.4
index 0df6b6d1685..8d4916f9501 100644
--- a/share/man/man4/man4.sparc/esp.4
+++ b/share/man/man4/man4.sparc/esp.4
@@ -1,10 +1,10 @@
-.\"	$OpenBSD: esp.4,v 1.11 2007/05/31 19:19:56 jmc Exp $
+.\"	$OpenBSD: esp.4,v 1.12 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project
 .\" All rights reserved.
 .\"
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt ESP 4 sparc
 .Os
 .Sh NAME
@@ -15,7 +15,7 @@
 .Cd "esp0 at obio0 addr 0xfa000000 level 4 flags 0x00ff000f"
 .Cd ""
 .Cd "dma0 at sbus0                                     " Pq on-board
-.Cd "esp0 at sbus0 flags 0x00ff000f                    " Pq sun4c
+.Cd "esp0 at sbus0 flags 0x00ff000f                    " Pq "sun4c and sun4e"
 .Cd "esp0 at dma0 flags 0x00ff000f                     " Pq sun4m
 .Cd ""
 .Cd "dma* at sbus?                                     " Pq "SBus SCSI"
@@ -25,7 +25,7 @@
 The
 .Nm
 is an on-board or SBus SCSI controller based on the NCR 53c94 chip, found
-on Sun 4/300, sun4c and sun4m workstations.
+on Sun 4/300, sun4c, sun4e and sun4m workstations.
 .Sh DEVICE FLAGS
 .Bl -tag -width "Bits XX-XX" -compact
 .It Bits 0-15
diff --git a/share/man/man4/man4.sparc/le.4 b/share/man/man4/man4.sparc/le.4
index 5176de8f797..85c8a773ef0 100644
--- a/share/man/man4/man4.sparc/le.4
+++ b/share/man/man4/man4.sparc/le.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: le.4,v 1.26 2008/03/31 07:44:30 jmc Exp $
+.\"	$OpenBSD: le.4,v 1.27 2010/07/10 19:38:39 miod Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -33,14 +33,14 @@
 .\"	from: Header: le.4,v 1.2 92/10/13 05:31:33 leres Exp
 .\"	from: @(#)le.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: March 31 2008 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt LE 4 sparc
 .Os
 .Sh NAME
 .Nm le
 .Nd AMD LANCE Ethernet device
 .Sh SYNOPSIS
-.Cd "le0 at sbus0                            " Pq "sun4c onboard"
+.Cd "le0 at sbus0                            " Pq "sun4c and sun4e onboard"
 .Cd "le* at sbus?                            " Pq SBus
 .Cd "lebuffer* at sbus?                      " Pq SBus
 .Cd "le* at lebuffer?                        " Pq SBus
diff --git a/share/man/man4/man4.sparc/led.4 b/share/man/man4/man4.sparc/led.4
index 9227244a791..94a9c92d987 100644
--- a/share/man/man4/man4.sparc/led.4
+++ b/share/man/man4/man4.sparc/led.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: led.4,v 1.5 2007/05/31 19:19:56 jmc Exp $
+.\"     $OpenBSD: led.4,v 1.6 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,14 +24,14 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt LED 4 sparc
 .Os
 .Sh NAME
 .Nm led
 .Nd SPARC LED driver
 .Sh SYNOPSIS
-.Cd "led0 at mainbus0                              " Pq "sun4"
+.Cd "led0 at mainbus0                              " Pq "sun4 and sun4e"
 .Cd "led0 at obio0                                 " Pq "sun4m: 4/600"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/man4.sparc/qe.4 b/share/man/man4/man4.sparc/qe.4
index e7480e186cc..133a47281be 100644
--- a/share/man/man4/man4.sparc/qe.4
+++ b/share/man/man4/man4.sparc/qe.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: qe.4,v 1.13 2008/03/31 07:44:30 jmc Exp $
+.\"     $OpenBSD: qe.4,v 1.14 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,15 +24,15 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2008 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt QE 4 sparc
 .Os
 .Sh NAME
 .Nm qe
 .Nd SPARC 10/100 Ethernet device
 .Sh SYNOPSIS
-.Cd "qec* at sbus?   " Pq "sun4c/sun4m"
-.Cd "qe* at qec?     " Pq "sun4c/sun4m"
+.Cd "qec* at sbus?   " Pq "sun4c/sun4e/sun4m"
+.Cd "qe* at qec?     " Pq "sun4c/sun4e/sun4m"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.sparc/qec.4 b/share/man/man4/man4.sparc/qec.4
index 64df427048d..0ce99050217 100644
--- a/share/man/man4/man4.sparc/qec.4
+++ b/share/man/man4/man4.sparc/qec.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: qec.4,v 1.18 2007/05/31 19:19:56 jmc Exp $
+.\"     $OpenBSD: qec.4,v 1.19 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,14 +24,14 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt QEC 4 sparc
 .Os
 .Sh NAME
 .Nm qec
 .Nd SPARC Quad Ethernet Controller
 .Sh SYNOPSIS
-.Cd "qec* at sbus?   " Pq "sun4c/sun4m"
+.Cd "qec* at sbus?   " Pq "sun4c/sun4e/sun4m"
 .Cd "qe* at qec?"
 .Cd "be* at qec?"
 .Sh DESCRIPTION
diff --git a/share/man/man4/man4.sparc/spif.4 b/share/man/man4/man4.sparc/spif.4
index f283569c791..05f5b1af71e 100644
--- a/share/man/man4/man4.sparc/spif.4
+++ b/share/man/man4/man4.sparc/spif.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: spif.4,v 1.15 2007/05/31 19:19:56 jmc Exp $
+.\"     $OpenBSD: spif.4,v 1.16 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,16 +24,16 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt SPIF 4 sparc
 .Os
 .Sh NAME
 .Nm spif
 .Nd SBus (spiffy) Serial/Parallel Interface
 .Sh SYNOPSIS
-.Cd "spif* at sbus?   " Pq "sun4c/sun4m"
-.Cd "stty* at spif?   " Pq "sun4c/sun4m"
-.Cd "sbpp* at spif?   " Pq "sun4c/sun4m"
+.Cd "spif* at sbus?   " Pq "sun4c/sun4e/sun4m"
+.Cd "stty* at spif?   " Pq "sun4c/sun4e/sun4m"
+.Cd "sbpp* at spif?   " Pq "sun4c/sun4e/sun4m"
 .Sh DESCRIPTION
 The
 .Nm spif
diff --git a/share/man/man4/man4.sparc/timer.4 b/share/man/man4/man4.sparc/timer.4
index 9ce36adacb4..30fb7c22eba 100644
--- a/share/man/man4/man4.sparc/timer.4
+++ b/share/man/man4/man4.sparc/timer.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: timer.4,v 1.3 2007/05/31 19:19:56 jmc Exp $
+.\"     $OpenBSD: timer.4,v 1.4 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 2004 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,14 +24,14 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt TIMER 4 sparc
 .Os
 .Sh NAME
 .Nm timer
 .Nd SPARC Timer
 .Sh SYNOPSIS
-.Cd "timer0 at mainbus0              # sun4c"
+.Cd "timer0 at mainbus0              # sun4c and sun4e"
 .Cd "timer0 at obio0                 # sun4m"
 .Cd "timer0 at obio0 addr 0xef000000 # sun4/300"
 .Sh DESCRIPTION
diff --git a/share/man/man4/man4.sparc/xbox.4 b/share/man/man4/man4.sparc/xbox.4
index c8df9bffe55..d76ab17c4ae 100644
--- a/share/man/man4/man4.sparc/xbox.4
+++ b/share/man/man4/man4.sparc/xbox.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: xbox.4,v 1.6 2007/05/31 19:19:56 jmc Exp $
+.\"     $OpenBSD: xbox.4,v 1.7 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,14 +24,14 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt XBOX 4 sparc
 .Os
 .Sh NAME
 .Nm xbox
 .Nd SPARC SBus Expansion Subsystem
 .Sh SYNOPSIS
-.Cd "xbox*   at sbus?   " Pq "sun4c/sun4m"
+.Cd "xbox*   at sbus?   " Pq "sun4c/sun4e/sun4m"
 .Cd "sbus*   at xbox?"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/man4.sparc/zs.4 b/share/man/man4/man4.sparc/zs.4
index 06b9c58f444..28c733e23c5 100644
--- a/share/man/man4/man4.sparc/zs.4
+++ b/share/man/man4/man4.sparc/zs.4
@@ -1,20 +1,20 @@
-.\"	$OpenBSD: zs.4,v 1.22 2010/06/07 19:54:30 miod Exp $
+.\"	$OpenBSD: zs.4,v 1.23 2010/07/10 19:38:39 miod Exp $
 .\"
 .\" Copyright (c) 1998, 2002 The OpenBSD Project
 .\" All rights reserved.
 .\"
 .\"
-.Dd $Mdocdate: June 7 2010 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt ZS 4 sparc
 .Os
 .Sh NAME
 .Nm zs
 .Nd Zilog 8530 (ZSCC) serial communications driver
 .Sh SYNOPSIS
-.Cd "zs0 at mainbus0                      " Pq sun4c
+.Cd "zs0 at mainbus0                      " Pq "sun4c and sun4e"
 .Cd "zs0 at obio0                         " Pq sun4m
 .Cd "zs0 at obio0 addr 0xf1000000 level 12" Pq sun4
-.Cd "zs1 at mainbus0                      " Pq sun4c
+.Cd "zs1 at mainbus0                      " Pq "sun4c and sun4e"
 .Cd "zs1 at obio0                         " Pq sun4m
 .Cd "zs1 at obio0 addr 0xf0000000 level 12" Pq sun4
 .Cd "zs2 at obio0 addr 0xe0000000 level 12" Pq sun4/300
diff --git a/share/man/man4/man4.sparc/zx.4 b/share/man/man4/man4.sparc/zx.4
index 110143dd8a7..b6f783d561e 100644
--- a/share/man/man4/man4.sparc/zx.4
+++ b/share/man/man4/man4.sparc/zx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zx.4,v 1.15 2008/03/31 07:44:30 jmc Exp $
+.\"	$OpenBSD: zx.4,v 1.16 2010/07/10 19:38:39 miod Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 31 2008 $
+.Dd $Mdocdate: July 10 2010 $
 .Dt ZX 4 sparc
 .Os
 .Sh NAME
@@ -95,7 +95,7 @@ The selected resolutions are:
 .Xr wscons 4 ,
 .Xr wsdisplay 4
 .Sh CAVEATS
-The ZX and TurboZX cards will not function in a sun4c class machine,
+The ZX and TurboZX cards will not function in a sun4c or sun4e class machine,
 due to PROM limitations.
 .Pp
 There is currently no software interface to change the frame buffer