IP28 bits. Also explain how to boot from the CD-ROM manually if the PROM

can't manage to use it from the `install system software' menu.

4 files changed, 57 insertions, 17 deletions

diff --git a/distrib/notes/sgi/contents b/distrib/notes/sgi/contents
index ee72616c698..c2dfd58610d 100644
--- a/distrib/notes/sgi/contents
+++ b/distrib/notes/sgi/contents
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: contents,v 1.18 2012/03/29 20:27:53 miod Exp $
+dnl	$OpenBSD: contents,v 1.19 2012/05/25 17:40:35 miod Exp $
 TopPart
 
 OpenBSDdistsets
 
-dnl four flavours of OpenBSDbsd
+dnl five flavours of OpenBSDbsd
 	bsd.IP22	A stock GENERIC-IP22 MACHINE kernel for IP22 class
 			machines, which will be installed on such systems
 			during the install.
@@ -12,6 +12,10 @@ dnl four flavours of OpenBSDbsd
 			class machines, which will be installed on such
 			systems during the install.
 
+	bsd.IP28	A stock GENERIC-IP28 MACHINE kernel for IP28 class
+			machines, which will be installed on such systems
+			during the install.
+
 	bsd.IP30	A stock GENERIC-IP30 MACHINE kernel for IP30 class
 			machines, which will be installed on such systems
 			during the install.
@@ -26,7 +30,7 @@ dnl one flavour of OpenBSDbsdmp so far...
 			which can be used instead of the GENERIC-IP30 kernel
 			after the install.
 
-dnl four flavours of OpenBSDrd
+dnl five flavours of OpenBSDrd
 	bsd.rd.IP22	A RAMDISK-IP22 kernel; the embedded filesystem
 			contains the installation tools.
 			Used for installation and upgrades.
@@ -35,6 +39,10 @@ dnl four flavours of OpenBSDrd
 			contains the installation tools.
 			Used for installation and upgrades.
 
+	bsd.rd.IP28	A RAMDISK-IP28 kernel; the embedded filesystem
+			contains the installation tools.
+			Used for installation and upgrades.
+
 	bsd.rd.IP30	A RAMDISK-IP30 kernel; the embedded filesystem
 			contains the installation tools.
 			Used for installation and upgrades.
@@ -53,8 +61,8 @@ dnl can't use OpenBSDcd because of the multiple bsd.rd
 			installed into the ``volume header'' of the boot
 			disk.
 
-	boot64		A 64-bit relocatable ELF boot block for IP27, IP30
-			and IP35 systems; will be installed into the
+	boot64		A 64-bit relocatable ELF boot block for IP27, IP28,
+			IP30 and IP35 systems; will be installed into the
 			``volume header'' of the boot disk.
 
 	bootecoff	A 32-bit ECOFF boot block for IP22 systems, also
diff --git a/distrib/notes/sgi/hardware b/distrib/notes/sgi/hardware
index 31d36587742..4d115399bee 100644
--- a/distrib/notes/sgi/hardware
+++ b/distrib/notes/sgi/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.18 2012/04/24 20:49:12 miod Exp $
+dnl	$OpenBSD: hardware,v 1.19 2012/05/25 17:40:35 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following machine families:
 
 	IP22 class machines:
@@ -12,6 +12,9 @@ OpenBSD/MACHINE OSREV runs on the following machine families:
 		Origin 200
 dnl		Origin 2000, Onyx 2
 
+	IP28 class machines:
+		POWER Indigo2 R10000
+
 	IP30 class machines:
 		Octane
 		Octane 2
@@ -32,7 +35,7 @@ dnl		Origin 300, Onyx 300
 
 Supported devices {:-include-:}:
 - Ethernet Adapters
-	built-in IP22 Seeq 80C03 Ethernet Controller (sq)
+	built-in IP22/IP28 Seeq 80C03 Ethernet Controller (sq)
 	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:
@@ -56,7 +59,7 @@ Supported devices {:-include-:}:
 	Via Rhine based Ethernet (vr)
 	3Com EtherLink XL and Fast EtherLink XL (xl)
 - SCSI Host Adapters
-	IP22 built-in WD33C93 (wdsc)
+	IP22/IP28 built-in WD33C93 (wdsc)
 	O2 built-in Adaptec AIC-7880 (ahc)
 	IP27/IP30/IP35 built-in QLogic ISP (isp)
 	LSI Logic Fusion-MPT Message Passing Interface (mpi)
@@ -102,7 +105,7 @@ If your hardware is not listed above, there is currently no support for it
 in this release.
 
 Currently unsupported hardware {:-include-:}:
-- audio on IP22 (Iris Audio, HAL 2) and IP30 (RAD)
+- audio on IP22/IP28 (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)
+- R8000 POWER Indigo 2 (IP26)
 - multiprocessor kernels are currently only supported on IP30 (Octane) systems
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index d421ef7d5a3..4f732039506 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.22 2012/04/08 22:25:52 miod Exp $
+dnl	$OpenBSD: install,v 1.23 2012/05/25 17:40:35 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -111,7 +111,8 @@ dnl point might differ accross systems, argh.
 
 Booting from CD-ROM installation media:
 
-NOTE: this boot method is only known to work on IP32 systems at the moment.
+	NOTE: This method will not work on IP27 and IP35 class
+	systems, which PROM expect a very specific CD-ROM layout.
 
   From the System Maintenance Menu, select '2' (or click on the
   appropriate icon if in graphics console) to Install System Software.
@@ -122,10 +123,38 @@ NOTE: this boot method is only known to work on IP32 systems at the moment.
 
   If the boot is successful, you will get a loader version message,
   executable sizes, and then the kernel copyright and device probe
-  messages.  Boot failure modes are typically a lot of CD-ROM drive
+  messages. Boot failure modes are typically a lot of CD-ROM drive
   activity, but no messages or complaints about magic numbers,
   checksums or formats.
 
+  If the system does not complain about being able to read the CD-ROM,
+  but of not being able to load a particular file, you can nevertheless
+  boot manually. This is the case on IP22 systems.
+
+  To boot manually from the CD-ROM, select ``Enter Command Monitor''
+  at the menu, and invoke the bootloader and ramdisk image manually.
+  For example, on an IP22 system, automatic boot may fail with:
+
+dnl IP22
+	Cannot load scsi(1)cdrom(4)partition(8)sashARCS.
+	Text start 0x10000, size 0xa120 doesn't fit in a FreeMemory area.
+	Cannot load scsi(1)cdrom(4)partition(8)sashARCS -- not enough space.
+
+  or:
+
+dnl IP20, changed from scsi(0) to scsi(1) for consistency
+	Cannot load scsi(1)cdrom(4)partition(8)sashARCS.
+	Error 15 while loading scsi(1)cdrom(4)partition(8)sashARCS
+
+  The name of the CD-ROM drive is then ``scsi(1)cdrom(4)'', and the manual
+  boot command will be:
+
+	>> scsi(1)cdrom(4)partition(8)bootecoff
+	   scsi(1)cdrom(4)partition(0)/bsd.rd.IP22
+
+  Note that this is a single commandline, the two paths should be separated
+  with spaces.
+
 Installing the system:
 
 OpenBSDInstallPart2
diff --git a/distrib/notes/sgi/prep b/distrib/notes/sgi/prep
index 76b29b27d47..9d70d1e519f 100644
--- a/distrib/notes/sgi/prep
+++ b/distrib/notes/sgi/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.23 2012/04/18 18:13:12 miod Exp $
+dnl	$OpenBSD: prep,v 1.24 2012/05/25 17:40:35 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.
@@ -22,9 +22,9 @@ dnl
 	Origin 200, Onyx 2
 	Origin 2000
 
-dnl    IP28 family:
-dnl	POWER Indigo 2 R10000
-dnl
+    IP28 family:
+	POWER Indigo 2 R10000
+
     IP30 family:
 	Octane, Octane 2