Mention that T5120/T5220 systems require an OBP update if they are below 4.28

level (matching the stealth commit to sparc64.html years ago); and update the
OBP update section to point to the current Oracle ``Firmware Domwnloads'' page.

3 files changed, 120 insertions, 109 deletions

diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index d9cffc02534..97bc959c369 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,84 +1,88 @@
-dnl	$OpenBSD: hardware,v 1.157 2013/02/25 20:28:01 miod Exp $
+dnl	$OpenBSD: hardware,v 1.158 2014/01/09 19:44:49 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
-	Ultra 1/1E 
-	Ultra 2 
-	Ultra 3 Mobile Workstation 
-	Ultra 5/10 
-	Ultra 25/45 
-	Ultra 30/60/80 
-	SPARCengineUltra AX 
-	SPARCengineUltra AXe 
-	SPARCengineUltra AXi 
-	SPARCengineUltra AXdp 
-	SPARCengineUltra AXmp 
-	SPARCengine CP1500 
-	Enterprise 150 
-	Enterprise 220R 
-	Enterprise 250 
-	Enterprise 420R 
-	Enterprise 450 
-	Enterprise 3000/4000/5000/6000 
-	Enterprise 3500/4500/5500/6500 
-	Enterprise 10000 
-	Sun Blade 100/150 
-	Sun Blade 1000/2000 
-	Sun Blade 1500/2500 
-	Sun Blade T6300 
-	Sun Blade T6320 
-	Sun Blade T6340 
-	Sun Fire V100/V120 
-	Sun Fire V125 
-	Sun Fire V210/V240/V440 
+	Ultra 1/1E
+	Ultra 2
+	Ultra 3 Mobile Workstation
+	Ultra 5/10
+	Ultra 25/45
+	Ultra 30/60/80
+	SPARCengineUltra AX
+	SPARCengineUltra AXe
+	SPARCengineUltra AXi
+	SPARCengineUltra AXdp
+	SPARCengineUltra AXmp
+	SPARCengine CP1500
+	Enterprise 150
+	Enterprise 220R
+	Enterprise 250
+	Enterprise 420R
+	Enterprise 450
+	Enterprise 3000/4000/5000/6000
+	Enterprise 3500/4500/5500/6500
+	Enterprise 10000
+	Sun Blade 100/150
+	Sun Blade 1000/2000
+	Sun Blade 1500/2500
+	Sun Blade T6300
+	Sun Blade T6320
+	Sun Blade T6340
+	Sun Fire V100/V120
+	Sun Fire V125
+	Sun Fire V210/V240/V440
 	Sun Fire V215/V245/V445
-	Sun Fire V250 
-	Sun Fire 280R 
-	Sun Fire V480/V880 
-	Sun Fire V490/V890 
-	Sun Fire V1280 
-	Sun Fire T1000/T2000 
-	Sun SPARC Enterprise T1000/T2000 
-	Sun SPARC Enterprise T5120/T5220 
-	Sun SPARC Enterprise T5140/T5240 
-	Sun SPARC Enterprise T5440 
-	Sun SPARC Enterprise M4000/M5000/M8000/M9000 
-	Sun SX1500 
-	Sun SX2500 
-	Sun SX3200 
-	Netra AX1105 
-	Netra AX2200 
-	Netra X1 
-	Netra 20/T4 
-	Netra 120 
-	Netra 210/240/440 
-	Netra 1280 
-	Netra 1290 
-	Netra T1 100/105 
-	Netra T1 AC200/DC200 
-	Netra T 1100 
-	Netra T 1120/1125 
-	Netra T 1400/1405 
+	Sun Fire V250
+	Sun Fire 280R
+	Sun Fire V480/V880
+	Sun Fire V490/V890
+	Sun Fire V1280
+	Sun Fire T1000/T2000
+	Sun SPARC Enterprise T1000/T2000
+	Sun SPARC Enterprise T5120/T5220  (see note below)
+	Sun SPARC Enterprise T5140/T5240
+	Sun SPARC Enterprise T5440
+	Sun SPARC Enterprise M4000/M5000/M8000/M9000
+	Sun SX1500
+	Sun SX2500
+	Sun SX3200
+	Netra AX1105
+	Netra AX2200
+	Netra X1
+	Netra 20/T4
+	Netra 120
+	Netra 210/240/440
+	Netra 1280
+	Netra 1290
+	Netra T1 100/105
+	Netra T1 AC200/DC200
+	Netra T 1100
+	Netra T 1120/1125
+	Netra T 1400/1405
 	Netra CP3060
 	Netra CP3260
 	Netra T2000
-	Netra T5220 
-	Netra T5440 
+	Netra T5220
+	Netra T5440
 dnl XXX uncomment machine entries as they become supported
-dnl	Sun Fire E2900/E4900/E6900 
-dnl	Sun Fire 12K/15K 
-dnl	Sun Fire E20K/E25K  
+dnl	Sun Fire E2900/E4900/E6900
+dnl	Sun Fire 12K/15K
+dnl	Sun Fire E20K/E25K
 	Fujitsu PRIMEPOWER 1
-	Fujitsu PRIMEPOWER 250/450 
+	Fujitsu PRIMEPOWER 250/450
 	Fujitsu PRIMEPOWER 650/850  (with SPARC64-V processors only)
-	Fujitsu SPARC Enterprise T1000/T2000 
-	Fujitsu SPARC Enterprise T5120/T5220 
-	Fujitsu SPARC Enterprise T5140/T5240 
-	Fujitsu SPARC Enterprise T5440 
-	Fujitsu SPARC Enterprise M4000/M5000/M8000/M9000 
+	Fujitsu SPARC Enterprise T1000/T2000
+	Fujitsu SPARC Enterprise T5120/T5220
+	Fujitsu SPARC Enterprise T5140/T5240
+	Fujitsu SPARC Enterprise T5440
+	Fujitsu SPARC Enterprise M4000/M5000/M8000/M9000
 as well on faithful clones of the above Sun systems, including:
-	Momentum Leopard-V 
-	RDI/Tadpole UltraBook 170/200 
+	Momentum Leopard-V
+	RDI/Tadpole UltraBook 170/200
 	Tadpole SPARCLE 550SX/650SX
-	Tadpole Viper 
+	Tadpole Viper
+
+    Note: SPARC Enterprise T5120 and T5220 systems need at least OpenBoot
+    4.28.0 to run OpenBSD.  Please refer to the ``Updating your firmware''
+    section later for firmware update instructions.
 
 Even if your machine is not listed above, it is possible that OpenBSD/MACHINE
 will work on it.  OpenBSD/MACHINE does not work on machines with Fujitsu's
@@ -120,7 +124,7 @@ Supported devices {:-include-:}:
 		PCI NCR53c8xx adapters (siop)
 		AMD Am53c974 PCscsi-PCI host adapters including the Tekram
 		  DC-390 (pcscp)
-		LSI Logic Fusion-MPT(Symbios Logic/NCR) (mpi) 
+		LSI Logic Fusion-MPT(Symbios Logic/NCR) (mpi)
 
 	PCI IDE Controllers: (pciide)
 		Acer Labs M5229
@@ -194,28 +198,28 @@ Supported devices {:-include-:}:
 		    Intel PRO/1000PT Quad Port Server Adapter
 		    Intel PRO/1000PF Server Adapter (SX Fiber)
 		    Intel PRO/1000PF Dual Port Server Adapter (SX Fiber)
-		Broadcom BCM570x (Tigon3) based PCI adapters 
-		    3Com 3c996-T (10/100/1000baseT) 
-		    3Com 3c996-SX (1000baseSX) 
-		    3Com 3c996B-T (10/100/1000baseT) 
-		    HP ProLiant NC370F PCI-X Gigabit NIC (1000baseSX) 
-		    HP ProLiant NC370T PCI-X Gigabit NIC (10/100/1000baseT) 
-		    HP ProLiant NC1020 PCI Gigabit NIC (10/100/1000baseT) 
-		    HP ProLiant NC6770 PCI-X Gigabit NIC (1000baseSX) 
-		    HP ProLiant NC7770 PCI-X Gigabit NIC (10/100/1000baseT) 
-		    HP ProLiant NC7771 PCI-X Gigabit NIC (10/100/1000baseT) 
-		    HP ProLiant NC7781 embedded PCI-X Gigabit NIC (10/100/1000baseT) 
-		    Netgear GA302T (10/100/1000baseT) 
-		    SysKonnect SK-9D21 (10/100/1000baseT) 
-		    SysKonnect SK-9D41 (1000baseSX) 
-		Sundance/Tamarack TC9021 based PCI adapters, including: 
-		    Allied Telesis CentreCOM LA1000-PCI-T 
-		    Antares Microsystems TC9021 
-		    D-Link DGE-550T 
+		Broadcom BCM570x (Tigon3) based PCI adapters
+		    3Com 3c996-T (10/100/1000baseT)
+		    3Com 3c996-SX (1000baseSX)
+		    3Com 3c996B-T (10/100/1000baseT)
+		    HP ProLiant NC370F PCI-X Gigabit NIC (1000baseSX)
+		    HP ProLiant NC370T PCI-X Gigabit NIC (10/100/1000baseT)
+		    HP ProLiant NC1020 PCI Gigabit NIC (10/100/1000baseT)
+		    HP ProLiant NC6770 PCI-X Gigabit NIC (1000baseSX)
+		    HP ProLiant NC7770 PCI-X Gigabit NIC (10/100/1000baseT)
+		    HP ProLiant NC7771 PCI-X Gigabit NIC (10/100/1000baseT)
+		    HP ProLiant NC7781 embedded PCI-X Gigabit NIC (10/100/1000baseT)
+		    Netgear GA302T (10/100/1000baseT)
+		    SysKonnect SK-9D21 (10/100/1000baseT)
+		    SysKonnect SK-9D41 (1000baseSX)
+		Sundance/Tamarack TC9021 based PCI adapters, including:
+		    Allied Telesis CentreCOM LA1000-PCI-T
+		    Antares Microsystems TC9021
+		    D-Link DGE-550T
                PCI RealTek 8129, RealTek 8139 Ethernet adapters, including:
                     Accton MPX 5030/5038
                     Allied Telesyn AT2550
-                    Corega FEther CB-TXD 10/100 Ethernet 
+                    Corega FEther CB-TXD 10/100 Ethernet
                     D-Link DFE530TX+, DFE538TX
                     Encore ENL832-TX-RENT 10/100 M PCI
                     Genius GF100TXR
@@ -227,7 +231,7 @@ Supported devices {:-include-:}:
                     Nortel BayStack 21
                     OvisLink LEF-8129TX, LEF-8139TX
                     SMC EZ Card 10/100 PCI 1211-TX
-                    TRENDnet TE100-PCBUSR CardBus 
+                    TRENDnet TE100-PCBUSR CardBus
                 Realtek 8169/8169S/8110S based PCI adapters, including:
                     Buffalo LGY-PCI-GT (8169S)
                     Corega CG-LAPCIGT (8169S)
@@ -254,17 +258,17 @@ Supported devices {:-include-:}:
 		    ELCON Systemtechnik Goldpfeil P-LAN
 		    Elecom LD-USB, LD-USBL/TX
 		    Elsa Microlink USB2Ethernet
-		    GIGABYTE GN-BR402W 
-		    Hawking UF100 
-		    HP HN210E 
+		    GIGABYTE GN-BR402W
+		    Hawking UF100
+		    HP HN210E
 		    I/O Data USB ETTX
 		    Kingston KNU101TX
-		    Linksys USB100TX, USB100H1, USB10T, USB10TA, USB10TX 
+		    Linksys USB100TX, USB100H1, USB10T, USB10TA, USB10TX
 		    Melco Inc. LUA-TX, LUA2-TX
-		    Microsoft MN110 
-		    Mobility EasiDock Ethernet 
-		    Netgear FA101 
-		    Omnidirectional Control Technology USB TO Ethernet 
+		    Microsoft MN110
+		    Mobility EasiDock Ethernet
+		    Netgear FA101
+		    Omnidirectional Control Technology USB TO Ethernet
 		    Siemens SpeedStream USB
 		    SmartBridges smartNIC 2
 		    SMC 2202USB/ETH
@@ -297,9 +301,9 @@ Supported devices {:-include-:}:
 		    TRENDnet TU2-ET100
 		    Z-TEK ZK-R01-2
 		CATC USB-EL1210A-based USB adapters, including:
-		    Belkin F5U111 
-		    CATC Netmate and Netmate II 
-		    SmartBridges SmartLink 
+		    Belkin F5U111
+		    CATC Netmate and Netmate II
+		    SmartBridges SmartLink
 		Davicom DM9601 based USB adapters, including:
 		    Corega FEther USB-TXC
 		    HenTong WK-668
diff --git a/distrib/notes/sparc64/prep b/distrib/notes/sparc64/prep
index 0c3833e0b79..a3925e6feac 100644
--- a/distrib/notes/sparc64/prep
+++ b/distrib/notes/sparc64/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.23 2008/07/29 22:24:25 kettenis Exp $
+dnl	$OpenBSD: prep,v 1.24 2014/01/09 19:44:49 miod Exp $
 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
@@ -46,8 +46,8 @@ understand the extended disk labels with 16 partitions.  You can use Solaris
 bootblocks, but remember that OpenBSD bootblocks must be installed with
 OpenBSD installboot and Solaris bootblocks with Solaris installboot.
 
-Most of the new Ultras shipped by Sun with a preinstalled Solaris have an
-initial specific factory setup of the boot ROM, in order to start up
+Most of the new Ultras shipped by Sun (or Oracle) with a preinstalled Solaris
+have an initial specific factory setup of the boot ROM, in order to start up
 Solaris WebStart at the first boot; the boot-device variable is set to
 disk:f.  Make sure you reset the boot device to its default value:
 
@@ -81,8 +81,11 @@ 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.
+and is not supported by Oracle.
 
+ifdef({:-living in the good old times-:},{:-dnl
+dnl This section is commented out, for historical reference, until a
+dnl reliable mirror of historical SunSolve patches can be found.
 The firmware update is delivered as a specific patch, depending on your
 machine:
 
@@ -111,6 +114,10 @@ dnl XXX uncomment machine entries as they become supported
 You can use SunSolve to get the patches by entering the
 correct Patch-ID# to the corresponding field at
     http://sunsolve.sun.com/pub-cgi/show.pl?target=patchpage
+-:},{:-dnl
+Firmware update information can be found at
+  http://www.oracle.com/technetwork/systems/patches/firmware/release-history-jsp-138416.html
+-:})dnl
 
 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/whatis b/distrib/notes/sparc64/whatis
index 6f3aecbde3f..a0c83cf38a5 100644
--- a/distrib/notes/sparc64/whatis
+++ b/distrib/notes/sparc64/whatis
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: whatis,v 1.11 2005/03/25 06:47:02 brad Exp $
+dnl	$OpenBSD: whatis,v 1.12 2014/01/09 19:44:49 miod Exp $
 
 OpenBSD/MACHINE runs on 64-bit UltraSPARC-based machines, including most of
-Sun Microsystems workstations and their clones.
+Sun Microsystems (now Oracle) workstations and their clones.