Updated compatibility info, especially on sun4 related items.

Still need to document a few items that would be FAQ sorts of things for
people running sun4 machines..

3 files changed, 38 insertions, 23 deletions

diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index c3b33206ad3..9ea46d2380a 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -47,11 +47,11 @@ Bootable installation/upgrade floppies:
 
   upgr21.fs
 	This disk contains a file system, and has holds the utilities 
-	needed in order to upgrade a system to the current version of OpenBSD.
+	needed in order to upgrade a system to OpenBSD 2.1
   
   miniroot21.fs
 	This is a miniroot filesystem image which can be copied to the
-	swap partition of an existing OpenBSD, NetBSD, or SunOS
+	swap partition of an existing OpenBSD, NetBSD, SunOS, or Solaris
 	installation to allow upgrading to OpenBSD 2.1
 
 The OpenBSD/sparc binary distribution sets contain the binaries which
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index 911ff531c0b..7844bff6e46 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -4,8 +4,8 @@ OpenBSD/sparc 2.1 runs on the following classes of machines:
 		for the 4/400 processor is incomplete)
 	- sun4m (e.g. sparc classic, 4, 5, 10, and 20)
 
-OpenBSD/sparc 2.1 does *not* run on these machines (yet):
-	- sun-4/400 (lacking support for the I/O cache, and has
+OpenBSD/sparc 2.1 does NOT run on these machines (yet):
+	- Sun 4/400 (lacking support for the I/O cache, and has
 			ethernet problems)
 	- sun4d (e.g. sparc center 2000)
 	- sun4u (e.g. Ultrasparcs)
@@ -18,36 +18,50 @@ around 16M of RAM, getting more RAM is more important than getting a
 faster CPU.)
 
 Supported devices include:
-	sun4c sbus video: 
+	sun4c and sun4m SBus video: 
 		cgsix, cgthree, and bwtwo frame buffers
-	sun4 video (not thoroughly tested?): 
-		P4 on-board bwtwo, and VME cgtwo card
+
+	sun4 video (not thoroughly tested...): 
+		P4  -- on-board bwtwo, cgfour, cgsix, cgeight,
+                VME -- cgtwo card
+
 	serial ports: 
-		ttya and ttyb (can be used as console if needed)
+		ttya and ttyb (can be used as console if needed),
+                ttyc and ttyd (Sun 4/300 only)
+
 	ethernet: 
 		on-board AMD Lance ethernet ("le0"), 
-		Sbus AMD Lance ethernet cards, 
+		SBus AMD Lance ethernet cards, 
 		on-board Intel 82586 ethernet (ie0 on 4/100's and 4/200's), 
 		VME Intel 82586 ethernet cards
+
 	SCSI: 
 		on-board "esp" SCSI controller (sun4c's, and the 4/300),
-		sbus "esp" SCSI controller, 
+		SBus "esp" SCSI controller, 
 		Sun "SUN-3"/"si" VME SCSI controller (polled mode only, slow),
 		Sun "SCSI Weird"/"sw" on-board controller (4/110 only, polled)
+
 	VME disks:
 		Xylogics 7053 VME/SMD disk controller ("xd"),
 		Xylogics 450/451 VME disk controller ("xy")
 		[note: VME/IPI disks are not supported]
-	sun floppy disk drive on sun4c's
-	sun keyboard and mouse
-	sun4c audio
+
+	Sun floppy disk drive on sun4c machines.
+
+	Sun keyboard and mouse.
+
+	sun4c audio.
 
 
 Hardware the we do NOT currently support, but get many questions
 about:
-	multiprocessor machines
-	audio drivers for sun4m machines
+	multiprocessor machines (ignores other CPUs..)
+	audio driver for sun4m machines
 	floppy driver for sun4m machines
-	interrupt driven SCSI driver for sun-4/100's and sun-4/200's
+	interrupt driven SCSI driver for Sun 4/100's and 4/200's
+        cgfourteen (SX) framebuffer
+        Graphics Tower (GT) framebuffer
+        Leo (ZX) framebuffer
+        S24 (ss5 only) framebuffer
 
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index df40250c52d..315660131a3 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -38,16 +38,15 @@ After transferring the miniroot to disk, bring the system down by:
 
 Then boot the miniroot by typing the appropriate command at the PROM:
 
-	> b sd(,,1)bsd -s			# for sun4 monitors
+	> b sd(,,1)bsd -s		# for sun4 monitors
 	ok boot sd(,,1)bsd -s		# for version 1 OpenBOOT ROMs
 	ok boot disk:b bsd -s		# for version 2 OpenBOOT ROMs
 
 If you've loaded the miniroot onto some other disk than `sd0' adapt
 the boot specifier accordingly, e.g.:
 
-	ok boot disk1:b bsd -s
-
-to boot from SCSI disk target 1 from a version 2 OpenBOOT ROM.
+        > b sd(0,20,1)bsd -s       # example - scsi target 4 on sun4 monitors
+	ok boot disk1:b bsd -s     # example - scsi target 1 on v2 OpenBOOT ROM
 
 This will cause the kernel contained in the miniroot to be booted.
 After the initial probe messages you'll asked to start the install
@@ -154,7 +153,7 @@ Boot your workstation from the server by entering the appropriate `boot'
 command at the monitor prompt. Depending on the PROM version in your machine,
 this command takes one of the following forms:
 
-	> b le()bsd -s		# for sun4 monitors
+	> b le()bsd -s			# for sun4 monitors
 	ok boot le()bsd -s		# for version 1 OpenBOOT ROMs
 	ok boot net bsd -s		# for version 2 OpenBOOT ROMs
 
@@ -278,8 +277,8 @@ filesystem writable is
 
     OpenBSD# mount -u /dev/sd0a /
 
-The Sun monitor normally tries to load a file called "vmunix". On
-OpenBOOT ROM systems you can change it to load OpenBSD instead using
+The Sun monitor normally tries to load a file called "vmunix".   
+On OpenBOOT ROM systems you can change it to load OpenBSD instead using
 the following commands:
 
 On version 1 OpenBOOT ROMs:
@@ -291,6 +290,8 @@ On version 2 OpenBOOT ROMs:
     ok setenv boot-file bsd
     ok setenv boot-device /sbus/esp/sd@0,0
 
+On sun4 systems, you may not need to specify the boot file, as 
+the OpenBSD boot blocks will look for "bsd" on the boot device by default.
 
 Congratulations, you have successfully installed OpenBSD 2.1.  When you
 reboot into OpenBSD, you should log in as "root" at the login prompt.