Sync with the current state of things

3 files changed, 20 insertions, 13 deletions

diff --git a/distrib/notes/sgi/hardware b/distrib/notes/sgi/hardware
index a1ada27171b..d9a4d90d512 100644
--- a/distrib/notes/sgi/hardware
+++ b/distrib/notes/sgi/hardware
@@ -1,12 +1,12 @@
-dnl	$OpenBSD: hardware,v 1.15 2012/03/29 20:27:53 miod Exp $
+dnl	$OpenBSD: hardware,v 1.16 2012/04/08 22:25:52 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following machine families:
 
 	IP22 class machines:
 		Indigo (R4x00 flavour)
 		Indigo2, Challenge M (IP22) (R4x00 flavour)
 		Indy, Challenge S (IP24)
-		(all configurations except for R4600-based are supported,
-		 although the R5000SC L2 cache is not used yet)
+		(all processor configurations are supported, although the
+		 R4600SC and R5000SC L2 cache is not used yet)
 
 	IP27 class machines:
 		Origin 200
@@ -99,4 +99,5 @@ 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)
 - multiprocessor kernels are currently only supported on IP30 (Octane) systems
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index 572c8dc0d22..d421ef7d5a3 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.21 2012/04/03 21:44:17 miod Exp $
+dnl	$OpenBSD: install,v 1.22 2012/04/08 22:25:52 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -23,9 +23,9 @@ dnl XXX provide more details!!!
   to the address obtained from the bootp or dhcp server.
 
   The bootp or dhcp server needs to know the ethernet address of the system.
-  On Indigo, Indy and O2 systems, this address can be found by using the
-  ``printenv'' command in the Maintenance Console, looking for the ``eaddr''
-  variable.
+  On Indigo, Indigo2, Indy and O2 systems, this address can be found by using
+  the ``printenv'' command in the Maintenance Console, looking for the
+  ``eaddr'' variable.
   On other systems, or if this variable is missing, this address is ususally
   written on a factory sticker on the back of the machine.
 
@@ -46,7 +46,8 @@ dnl are collected, it would be nice to be able to tell `PROM versions before
 dnl that date are affected, PROM versions after that date are fine' rather
 dnl than listing per-machine version strings. But then the actual cutoff
 dnl point might differ accross systems, argh.
-	The following PROM versions are known to exhibit this behaviour:
+	The following PROM versions are known to exhibit this troublesome
+	behaviour:
 	- on Indigo:
 	>> version
 	PROM Monitor SGI Version 4.0.5G Rev B IP20,  Nov 10, 1992 (BE)
@@ -54,7 +55,8 @@ dnl point might differ accross systems, argh.
 	>> version 
 	PROM Monitor SGI Version 5.1 Rev B3 IP24 Sep 17, 1993 (BE)
 
-	On the other hand, the following PROM versions are known to work:
+	On the other hand, the following PROM versions are known to be
+	unaffected by this problem:
 	- on Indigo2:
 	>> version
 	PROM Monitor SGI Version 5.3 Rev C IP22 Oct 20, 1994 (BE)
@@ -62,9 +64,7 @@ dnl point might differ accross systems, argh.
 	>> version
 	PROM Monitor SGI Version 5.3 Rev B10 R4X00/R5000 IP24 Feb 12, 1996 (BE)
 
-	Note that these lists do not pretend to be complete, and depending
-	on your system, other, more recent, PROM versions might be affected
-	as well.
+	Note that these lists do not pretend to be complete.
 
 	If the server system runs OpenBSD, the following command can be
 	used to enforce a safe port number:
diff --git a/distrib/notes/sgi/prep b/distrib/notes/sgi/prep
index 8e23c642b04..80e25162477 100644
--- a/distrib/notes/sgi/prep
+++ b/distrib/notes/sgi/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.21 2012/03/29 20:27:53 miod Exp $
+dnl	$OpenBSD: prep,v 1.22 2012/04/08 22:25:52 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.
@@ -15,10 +15,16 @@ Identifying your system:
 	Indigo 2, Challenge M (R4x00 flavour)
 	Indy, Challenge S
 
+dnl    IP26 family:
+dnl	POWER Indigo 2 (R8000)
+dnl
     IP27 family:
 	Origin 200, Onyx 2
 	Origin 2000
 
+dnl    IP28 family:
+dnl	POWER Indigo 2 R10000
+dnl
     IP30 family:
 	Octane, Octane 2