update here too

2 files changed, 33 insertions, 35 deletions

diff --git a/distrib/notes/sgi/hardware b/distrib/notes/sgi/hardware
index d9a4d90d512..68750c34cf5 100644
--- a/distrib/notes/sgi/hardware
+++ b/distrib/notes/sgi/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.16 2012/04/08 22:25:52 miod Exp $
+dnl	$OpenBSD: hardware,v 1.17 2012/04/18 18:13:12 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following machine families:
 
 	IP22 class machines:
@@ -33,7 +33,7 @@ dnl		Origin 300, Onyx 300
 Supported devices {:-include-:}:
 - Ethernet Adapters
 	built-in IP22 Seeq 80C03 Ethernet Controller (sq)
-        built-in O2 Mace Ethernet Controller (mec)
+	built-in O2 Mace Ethernet Controller (mec)
 	IOC3 Ethernet Controller (built-in on IP27, IP30 and some IP35) (iec)
 	Broadcom BCM570x (a.k.a. Tigon3) based PCI adapters (bge) including:
 		3Com 3c996-SX
@@ -42,14 +42,14 @@ Supported devices {:-include-:}:
 		Netgear GA302T
 		SysKonnect SK-9D21
 		SysKonnect SK-9D41
-        Intel/DEC 21443 "Tulip" clones (dc)
+	Intel/DEC 21443 "Tulip" clones (dc)
 	3Com EtherLink III and Fast EtherLink III Ethernet (ep)
-        Intel i8255x-based (fxp) including:
-                Intel EtherExpress PRO/10+
-                Intel EtherExpress PRO/100, PRO/100B, and PRO/100+
-                Intel EtherExpress PRO/100+ "Management Adapter"
-                Intel EtherExpress PRO/100 Dual Port
-                Intel PRO/100 VE, PRO/100 VM, and PRO/100 S
+	Intel i8255x-based (fxp) including:
+		Intel EtherExpress PRO/10+
+		Intel EtherExpress PRO/100, PRO/100B, and PRO/100+
+		Intel EtherExpress PRO/100+ "Management Adapter"
+		Intel EtherExpress PRO/100 Dual Port
+		Intel PRO/100 VE, PRO/100 VM, and PRO/100 S
 	Myson Technology MTD8xx 3-in-1 Fast Ethernet (mtd)
 	NE2000 compatible PCI Ethernet (ne)
 	Alteon Tigon I and II Gigabit Ethernet (ti)
@@ -57,13 +57,13 @@ Supported devices {:-include-:}:
 	3Com EtherLink XL and Fast EtherLink XL (xl)
 - SCSI Host Adapters
 	IP22 built-in WD33C93 (wdsc)
-        O2 built-in Adaptec AIC-7880 (ahc)
+	O2 built-in Adaptec AIC-7880 (ahc)
 	IP27/IP30/IP32/IP35 built-in QLogic ISP (isp)
-        LSI Logic Fusion-MPT Message Passing Interface (mpi)
-        53C8xx-based SCSI (siop)
+	LSI Logic Fusion-MPT Message Passing Interface (mpi)
+	53C8xx-based SCSI (siop)
 - RS-232 devices
 	on-board Z8530 compatible serial ports (zstty)
-        on-board NS16550 compatible serial ports (com)
+	on-board NS16550 compatible serial ports (com)
 - Universal Serial Bus (USB) Controllers and Devices
 	USB Universal Host Controller (uhci)
 	USB Open Host Controller (ohci)
@@ -77,26 +77,30 @@ Supported devices {:-include-:}:
 	USB Modems (umodem)
 	USB Printers (ulpt)
 - Audio Devices
-        O2 Moosehead A/V Board audio (mavb)
+	O2 Moosehead A/V Board audio (mavb)
 - Video Devices
-        O2 built-in Graphics Back End framebuffer (gbe)
-	ImpactSR frame buffer (impact) found on some Octane systems.
-	VPro frame buffer (odyssey) found on Fuel, Tezro, Octane 2, as well
-	  as on some late Octane systems.
+	Indigo Light (`Entry', `Starter') graphics (light)
+	Indy, Indigo2 Newport (`XL', `XGE') graphics (newport)
+	Indy, Indigo2 Express (`XS', `XZ', `Elan', `Extreme') graphics (grtwo)
+	O2 built-in Graphics Back End framebuffer (gbe)
+	Indigo2, Octane Impact and ImpactSR graphics (impact)
+	Octane 2, Fuel, Tezro VPro graphics (odyssey)
 - Input Devices
-        O2 built-in PS/2 Controller (mkbc)
-	Octane/Origin/Fuel/Tezro built-in PS/2 Controller (iockbc)
-                PS/2 mice (pms)
-                PS/2 keyboards (pckbd)
+	Indigo keyboard and mouse (zskbd, zsms)
+	Indigo2 and Indy onboard PS/2 controller (pckbc)
+	O2 onboard PS/2 Controller (mkbc)
+	Octane/Origin/Fuel/Tezro onboard PS/2 Controller (iockbc)
+	PS/2 mice (pms)
+	PS/2 keyboards (pckbd)
 	USB keyboard and mice (already listed above)
 - Miscellaneous Devices
-	``soft'' power button as available on SGI O2 and Octane (power)
+	Indy and Indigo2 power and volume buttons (panel)
+	O2 and Octane ``soft'' power button (power)
 
 If your hardware is not listed above, there is currently no support for it
 in this release.
 
 Currently unsupported hardware {:-include-:}:
-- input devices and frame buffers on IP22
 - audio on IP22 (Iris Audio, HAL 2) and IP30 (RAD)
 - some IP27 and IP35 systems (Origin 2000, Onyx 2, Origin 300 and Onyx 300)
 - R8000 and R10000 Indigo 2 (IP26 and IP28)
diff --git a/distrib/notes/sgi/prep b/distrib/notes/sgi/prep
index 80e25162477..76b29b27d47 100644
--- a/distrib/notes/sgi/prep
+++ b/distrib/notes/sgi/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.22 2012/04/08 22:25:52 miod Exp $
+dnl	$OpenBSD: prep,v 1.23 2012/04/18 18:13:12 miod Exp $
 Before you install your system, you should identify your system family and
 familiarize yourself with the ARCBios setup and how to run programs from
 the Command monitor prompt.
@@ -82,14 +82,7 @@ Switching from serial to graphics console and vice versa:
     support your frame buffer, it will fallback to serial console on the
     first serial port.
 
-    As of OpenBSD OSREV, supported graphics console devices are:
-    - the onboard frame buffer on IP32 systems (gbe)
-    - ImpactSR (Mardigras) frame buffer on IP30 (I-Series and E-Series)
-      (impact)
-    - VPro family frame buffers on IP27, IP30 and IP35 systems (odyssey)
-
-    And the following graphics devices are not supported yet:
-    - all IP22 frame buffers
+    As of OpenBSD OSREV, the only unsupported graphics console devices are:
     - Infinite Reality (Kona) frame buffer on IP27/IP35 Onyx systems
     - Voyager (Ultimate Vision) frame buffer on IP35 Onyx 4 systems
 
@@ -128,8 +121,9 @@ Setting the environment:
     When setting up the system to boot from disk, the ``OSLoader''
     environment variable will need to be changed.
 
-    Its default value is ``sash'' or ``sash64'', which is IRIX's standalone
-    shell and loader. Set it to ``boot'', the OpenBSD boot loader.
+    Its default value is ``sashARCS'', ``sash'' or ``sash64'', which is
+    IRIX's standalone shell and loader. Set it to ``boot'', the name under
+    which the OpenBSD boot loader has been installed.
 
     The kernel image loaded by default is specified in the ``OSLoadFilename''
     variable, which defaults to ``unix''.  To boot OpenBSD, set it to