Update supported hardware list (sync with www page).

Add a list of known to work MBus modules.
Remove mention of manual creation of ttyc and ttyd for 4/300.
Correct the description of le(4) flags.
Mention sun4u are supported by the OpenBSD/sparc64 port.

3 files changed, 49 insertions, 50 deletions

diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index d09e052b133..2db315e03d1 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -13,15 +13,15 @@ OpenBSDrd
 		bsd.scsi3	A kernel with SCSI target 3 re-mapped as 0
 				and 0 mapped as 3.
 
-		installboot	The OpenBSD/sparc boot loader installation
+		installboot	The OpenBSD/MACHINE boot loader installation
 				program
-		bootxx		The OpenBSD/sparc boot block
-		boot		The OpenBSD/sparc secondary boot loader
-		boot.net	The OpenBSD/sparc network boot loader
+		bootxx		The OpenBSD/MACHINE boot block
+		boot		The OpenBSD/MACHINE secondary boot loader
+		boot.net	The OpenBSD/MACHINE network boot loader
 
 
 Please note that there are multiple bootable images and kernels, intended
-to allow installing OpenBSD/sparc in a variety of situations without
+to allow installing OpenBSD/MACHINE in a variety of situations without
 requiring a pre-existing working operating system.
 
 The "miniroot{:--:}OSrev.fs" is a small bootable root filesystem that can be used
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index 82175fd77de..46ffec33cb1 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -1,21 +1,36 @@
-OpenBSD/sparc OSREV runs on the following classes of machines:
+OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- sun4  -- 4/100, 4/200, and 4/300.   (note that support
 		   for the 4/400 processor is incomplete)
 	- sun4c -- SS1, SS1+, SS2, IPC, ELC, IPX, and SLC
-	- sun4m -- Sun Sparc Classic, LX, 4, 5, 10, 20, and 600MP.
-		   Tadpole SPARCbook 3GS and 3GX
-		*** See Notes Below
-	- faithful clones of the above Sun systems (e.g. Integrix, Force)
-
-OpenBSD/sparc OSREV does NOT run on these machines (yet):
-	- Sun 4/400 --  Lacking support for the I/O cache, and related
-			ethernet problems.
-	- sun4d -- SPARCcenter 2000, SPARCserver 1000,  XDBus and
-			multiprocessor support issues.
-	- sun4u (Ultrasparcs) --  currently no support for 64-bit Sparc
-			architecture extensions.  sun4u will have its own port.
+	- sun4m -- Sun Sparc Classic, LX, 4, 5, 10, 20, and 600MP
+	- Tadpole SPARCbook 3GS, 3GX and 3XP
+	- Force CPU5V
+	- as well as faithful clones of the above Sun systems, such as:
+		+ Aries Research Inc, Parrot II
+		+ Axil 243, 245, 320 (and possibly other models)
+		+ Opus 5000, 5250
+		+ TWS,SuperCOMPstation-20S
+		+ Tatung micro COMPstation 5, COMPstation LX
+		+ RDI BrideLite and PowerLite
+		+ DTKstation/Classic+
+		+ Transtec SS5/170
+
+For sun4m machines, the following Mbus CPU modules are supported:
+	- SM30, SM40, SM41, SM50, SM51, SM51-2, SM61, SM61-2, SM71,
+	  SM81, SM81-2
+	- SM100
+	- Ross RT620/RT625 at 90, 125, 150 or 166 MHz
+
+OpenBSD/MACHINE OSREV does NOT run on these machines (yet):
+	- Sun 4/400
+		Lacking support for the I/O cache, and related
+		ethernet problems.
+	- sun4d -- SPARCcenter 2000, SPARCserver 1000
+		XDBus and multiprocessor support issues.
+	- sun4u (Ultrasparcs)
+		These machines are supported by the OpenBSD/sparc64 port.
 	- clones that are significantly different from the Sun systems 
-			(e.g. Solbourne)
+		(e.g. K-Bus based Solbourne)
 
 The minimal configuration requires 4M of RAM and ~60M of disk space.
 To install the entire system requires much more disk space, and to run
@@ -26,7 +41,7 @@ faster CPU.)  Installation from "ramdisk" kernels requires 8M of RAM.
 
 Supported devices {:-include-:}:
 	sun4c and sun4m SBus video: 
-		cgsix, cgthree, and bwtwo frame buffers
+		cgsix (GX, GX+, TGX, TGX+), cgthree, and bwtwo frame buffers
 
         sun4m on-board machine specific video:
                 TCX, cgfourteen (aka SX), p9100 (Tadpole 3GS, 3GX)
@@ -94,15 +109,6 @@ Hardware the we do NOT currently support, but get many questions about:
         SBus ZX framebuffer (aka Leo)
 	Tadpole onboard PCMCIA and modem
 
-*** Note: sun4m and general sparc caveats
-
-As of the OpenBSD OSREV release there are still a few outstanding problems
-with OpenBSD on some Sparc architectures.  Certain lower end CPU modules are
-known to have problems, in particular the cache-less SM30 and SM40.
-Support for the Viking/SuperSPARC implementations with cache has improved
-dramatically.  Some sun4m machines are lacking useful floppy/audio support
-and the VME bus on the 600MP is unsupported.
-
 The supplied GENERIC kernel is the best attempt at a configuration that
 works on the widest range of machinery (sun4, sun4c, and sun4m).  
 If you have problems with the OpenBSD OSREV kernel in this distribution, 
@@ -118,9 +124,9 @@ UltraSparc (sun4u) or HyperSparc (sun4m) systems would help ensure the
 long-term viability of OpenBSD on Sparc based systems.
 
 Your support in terms of documenting previously unknown problems with
-OpenBSD/sparc, helping debug known problems, implementing missing pieces,
+OpenBSD/MACHINE, helping debug known problems, implementing missing pieces,
 and testing OpenBSD on various architectures is actively encouraged.
 The OpenBSD mailing lists, web-pages and sendbug utility are your best
-tools for helping make OpenBSD/sparc a better release.
+tools for helping make OpenBSD/MACHINE a better release.
 
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 18e4aeb52d6..daceb014729 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -75,10 +75,10 @@ installation scripts'' below.
 
 Booting from CD-ROM installation media:
 
-	> b sd(,30,0)OSREV/sparc/bsd.rd		# for Sun4 monitors*
+	> b sd(,30,0)OSREV/MACHINE/bsd.rd		# for Sun4 monitors*
 						# (not working currently)
-	ok boot sd(,6,0)OSREV/sparc/bsd.rd	# for version 1 OpenBOOT ROMs
-	ok boot cdrom OSREV/sparc/bsd.rd	# for version 2 OpenBOOT ROMs
+	ok boot sd(,6,0)OSREV/MACHINE/bsd.rd	# for version 1 OpenBOOT ROMs
+	ok boot cdrom OSREV/MACHINE/bsd.rd	# for version 2 OpenBOOT ROMs
 
 If the boot is successful, you will get a loader version message,
 executable sizes and then the Kernel copyright and device probe
@@ -86,7 +86,7 @@ messages.  Boot failure modes are typically a lot of CD-ROM drive
 activity, but no messages or complaints about magic numbers,
 checksums or formats.
 
-Not all sparc systems support bootable CDROMS and the current
+Not all MACHINE systems support bootable CDROMS and the current
 boot image is only known to work on sun4c and sun4m architectures.
 If it does not work, you'll have to create a boot floppy or bootable
 hard disk using the instructions under preparing boot media.
@@ -258,10 +258,10 @@ OpenBSDBootMsgs
 	configure.  For each network interface you select to configure, it
 	will ask for the IP address to use, the symbolic host name to use,
 	the netmask to use and any media flags to set.  This is driver
-	dependent, but for the sparc le(4) driver, the flags usually carry
+	dependent, but for the MACHINE le(4) driver, the flags usually carry
 	meaning:
 
-		auto		Use existing setting (only setup by netboot)
+		autoselect	Use existing setting (default)
 		10baseT		Use UTP (twisted pair) port
 		10base5 	Use AUI port
 
@@ -338,14 +338,7 @@ when running from a serial console, you may wish to adjust the eeprom
 settings for input-device, output-device, screen-#columns, and screen-#rows
 as appropriate.  
 
-If you plan on using the extra serial ports on 4/300 systems, 
-you'll need to make sure you have device nodes for them e.g.:
-  mknod /dev/ttyc c 12 4
-  mknod /dev/ttyd c 12 5
-To use these ports for terminals etc, you will want to add them to
-/etc/ttys.
-
-In order to use 'tip' on OpenBSD/sparc, you'll need to edit /etc/ttys
+In order to use 'tip' on OpenBSD/MACHINE, you'll need to edit /etc/ttys
 and add "local" to the end of the tty configuration line, and run 
 'ttyflags -a' to put your changes into effect.
 
@@ -368,10 +361,10 @@ least the following pieces:
     a kernel, most likely "/bsd"
 
 All these pieces, except "/boot" and the GNU utilities are supplied in
-the OpenBSD/sparc distribution.
+the OpenBSD/MACHINE distribution.
 
 You need to format and partition the disk using SunOS (since
-OpenBSD/sparc uses SunOS disk labels.)  Give yourself adequate
+OpenBSD/MACHINE uses SunOS disk labels.)  Give yourself adequate
 partition sizes.  Here is an example layout:
 
     partition    size   offset	  will be..
@@ -469,7 +462,7 @@ 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/sparc
+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
@@ -484,9 +477,9 @@ Here's an example to illustrate this whole mess:
     else
 	server# set SKIP=0
 	server# set KARCH=SUN4C
-    server# dd if=boot of=/tftpboot/boot.sparc.OpenBSD.$KARCH skip=$SKIP bs=32
+    server# dd if=boot of=/tftpboot/boot.MACHINE.OpenBSD.$KARCH skip=$SKIP bs=32
     server# cd /tftpboot
-    server# ln -s boot.sparc.OpenBSD.$KARCH 8273900B.$KARCH
+    server# ln -s boot.MACHINE.OpenBSD.$KARCH 8273900B.$KARCH
 
 
 After the boot program has been loaded into memory and given control by