- U2 has been tested

- floppies have neither NFS nor CDROM support
- add a section about firmware upgrades, and tell that they might be
necessary, especially for U1/1E/2 systems. Pointed out from brad@, some of
the information provided here comes from Sun's firmware update documentation.

6 files changed, 71 insertions, 8 deletions

diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index e8c73d52638..f875fbb0973 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -9,8 +9,8 @@ OpenBSDminiroot
 OpenBSDfloppy
 				This floppy image will boot on SBus-based
 				MACHINE models, such as:
-				- Ultra 1
-				- Ultra 2 (not tested)
+				- Ultra 1/1E
+				- Ultra 2
 
 		floppyB{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
 				see below.
@@ -24,7 +24,8 @@ dnl XXX remove the following lines once floppyB is working
 				correctly; your mileage may vary.
 				However, it will work correctly when used
 				as a miniroot and booted from the disk's
-				swap area.
+				swap area, although the regular miniroot
+				is preferred for this usage.
 
 OpenBSDdistsets
 
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index 1c7203a61a2..9acef762d78 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,14 +1,18 @@
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- SBUS based workstations:
 		Ultra 1
-		Ultra 1/Creator (should work, but has not been tested)
-		Ultra 2 (should work, but could not be tested)
+		Ultra 1E (Creator) (should work, but has not been tested)
+		Ultra 2
 	- PCI based workstations:
 		Blade 100 (onboard ethernet has issues)
 		Enterprise 250
 		Ultra 5
 		Ultra 10
 		Ultra 30
+dnl XXX uncomment machine entries as they become supported
+dnl		Ultra 60 / Enterprise 220R
+dnl		Ultra 80 / Enterprise 420R
+dnl		Ultra 450 / Enterprise 450
 		SPARCengineUltra AX
 		SPARCengineUltra AXi
 	- faithful clones of the above Sun systems.
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index 298cf0b9811..edc4ff328e9 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -36,6 +36,10 @@ Booting from Floppy Disk installation media:
        ok boot floppy bsd
 
 This will cause the kernel contained in the floppy to be booted.
+Please note that PCI systems might not be able to boot from floppy; also,
+Ultra 1, 1E and 2 systems might need a firmware update to be able to boot
+from floppy; refer to the ``Updating your firmware'' section earlier in
+this document for details.
 
 
 Booting From CD-ROM installation media:
diff --git a/distrib/notes/sparc64/prep b/distrib/notes/sparc64/prep
index bca5afc0bd7..6707fc21a8f 100644
--- a/distrib/notes/sparc64/prep
+++ b/distrib/notes/sparc64/prep
@@ -1,3 +1,9 @@
+If your UltraSPARC machine is somewhat old, it might need a firmware update
+before it can be used under OpenBSD. You are advised to try to install
+OpenBSD first; if it can't boot or fails mysteriously, you might need to
+update your firmware. To do so, check the ``Updating your firmware''
+section later in this document.
+
 Your OpenBOOT ROM may need some setup.  You cannot use the security modes
 of the OpenBOOT ROM.  Make sure that the ROM security modes are disabled:
 
@@ -50,3 +56,51 @@ disk:f.  Make sure you reset the boot device to its default value:
 
 will work for most systems. This can be adapted if you've multiple
 systems installed and know what you're doing.
+
+
+Updating your firmware:
+-----------------------
+
+If OpenBSD does not boot or install properly on your machine, it might need
+a firmware update.
+
+Updating your firmware is a dangerous operation which may damage your
+hardware. Be sure to follow carefully these instructions, and in doubt,
+please don't do this.
+
+You will need to have a working operating system installed on your machine,
+in order to perform the update.  If this is not the case, you might be able
+to boot the flash updater software via network, but this has not been tested
+and is not supported by Sun.
+
+The firmware update is delivered as a specific patch, depending on your
+machine:
+
+	Machine		Patch number
+dnl XXX uncomment machine entries as they become supported
+	Blade 100	111179
+dnl	Enterprise 220R	106455
+dnl	Enterprise 420R	109082
+	Enterprise 250	106503
+dnl	Enterprise 450	106122
+	Ultra 1		104881
+	Ultra 1E	104288
+	Ultra 2		104169
+	Ultra 5		106121
+	Ultra 10	106121
+	Ultra 30	105930
+dnl	Ultra 60	106455
+dnl	Ultra 80	109082
+dnl	Ultra 450	106122
+
+Get the patch installation notes from SunSolve, as
+    ftp://sunsolve.sun.com/pub/patches/104169.readme
+(replace 104169 with the correct patch number).
+Check the Patch-ID# line in this readme file to get the patch filename, for
+example 104169-08. The patch filename will then be either
+    ftp://sunsolve.sun.com/pub/patches/104169-08.tar.Z
+or
+    ftp://sunsolve.sun.com/pub/patches/104169-08.zip
+
+Follow the patch installation notes very carefully. You will need to open
+your machine in order to apply this patch.
diff --git a/distrib/notes/sparc64/upgrade b/distrib/notes/sparc64/upgrade
index 69b1e7fe73b..4a6186cdf50 100644
--- a/distrib/notes/sparc64/upgrade
+++ b/distrib/notes/sparc64/upgrade
@@ -3,4 +3,4 @@ are not expected.
 If you have been using an old OpenBSD/MACHINE snapshot, you can follow the
 following instructions.
 
-OpenBSDUpgrade({:-the miniroot, or the installation floppy-:})
+OpenBSDUpgrade({:-CDROM, the miniroot, or the installation floppy-:})
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index 78b99a75a53..e9283edce4b 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -1,9 +1,9 @@
 Installation is supported from several media types, including:
 
-	CD-ROM
+	CD-ROM (NOT supported if booting from floppy)
 	FFS partitions
 	Tape
-	Remote NFS partition
+	Remote NFS partition (NOT supported if booting from floppy)
 	FTP
 	HTTP