Sync with IP27/30/35 support and new kernel filenames.

5 files changed, 102 insertions, 47 deletions

diff --git a/distrib/notes/sgi/contents b/distrib/notes/sgi/contents
index 7b06769fa95..7ebb34bfa1c 100644
--- a/distrib/notes/sgi/contents
+++ b/distrib/notes/sgi/contents
@@ -1,11 +1,36 @@
-dnl	$OpenBSD: contents,v 1.10 2009/05/12 21:06:50 miod Exp $
+dnl	$OpenBSD: contents,v 1.11 2009/05/30 05:00:37 miod Exp $
 TopPart
 
 OpenBSDdistsets
 
-OpenBSDbsd
-
-OpenBSDrd
+dnl three flavours of OpenBSDbsd
+	bsd.IP27	A stock GENERIC.IP27 MACHINE kernel for IP27 and IP35
+			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.
+
+	bsd.IP32	A stock GENERIC.IP32 MACHINE kernel for IP32 class
+			machines, which will be installed on such systems
+			during the install.
+
+dnl three flavours of OpenBSDrd
+	bsd.rd.IP27	A compressed RAMDISK.IP27 kernel; the embedded
+			filesystem contains the installation tools.
+			Used for simple installation from a pre-existing
+			system.
+
+	bsd.rd.IP30	A compressed RAMDISK.IP30 kernel; the embedded
+			filesystem contains the installation tools.
+			Used for simple installation from a pre-existing
+			system.
+
+	bsd.rd.IP32	A compressed RAMDISK.IP32 kernel; the embedded
+			filesystem contains the installation tools.
+			Used for simple installation from a pre-existing
+			system.
 
 OpenBSDcd
 
diff --git a/distrib/notes/sgi/hardware b/distrib/notes/sgi/hardware
index d69121bc319..1b6a62a5800 100644
--- a/distrib/notes/sgi/hardware
+++ b/distrib/notes/sgi/hardware
@@ -1,16 +1,25 @@
-dnl	$OpenBSD: hardware,v 1.5 2008/08/25 18:22:41 jasper Exp $
+dnl	$OpenBSD: hardware,v 1.6 2009/05/30 05:00:37 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following machines:
-	O2 with the following CPU configurations:
-		R5000, R52xx and RM7000 with any secondary/tertiary caches.
-		R10000 and R12000 with secondary caches.
-
-	On O2's with R10000 CPUs the Speculative Dirty problem is not
-	handled in any special way. However, so far, we have not seen
-	any problems from this behaviour.
+	IP27 class machines:
+		Origin 200, Onyx 2
+		Origin 2000
+	IP30 class machines:
+		Octane
+		Octane 2
+	IP32 class machines:
+		O2
+		O2+
+		(both R50000/RM52xx/RM70000 and R10000/R12000 configurations
+		 are supported)
+	IP35 class machines:
+		Origin 300, Origin 3000, Onyx 300
+dnl		Origin 350, Onyx 350, Onyx 4
+		Fuel
+dnl		Tezro
 
 Supported devices {:-include-:}:
 - Ethernet Controllers
-        built-in Mace Ethernet Controller (mec)
+        built-in O2 Mace Ethernet Controller (mec)
         Intel/DEC 21443 "Tulip" clones (dc)
         Intel i8255x-based (fxp) including:
                 Intel EtherExpress PRO/10+
@@ -19,7 +28,8 @@ Supported devices {:-include-:}:
                 Intel EtherExpress PRO/100 Dual Port
                 Intel PRO/100 VE, PRO/100 VM, and PRO/100 S
 - SCSI controllers
-        built-in Adaptec AIC-7880 (ahc)
+        O2 built-in Adaptec AIC-7880 (ahc)
+	IP27/IP30/IP32 built-in QLogic ISP (isp)
         53C8xx-based SCSI (siop)
         LSI Logic Fusion-MPT Message Passing Interface (mpi)
 - RS-232 devices:
@@ -40,12 +50,11 @@ Supported devices {:-include-:}:
 - Miscellaneous devices:
         battery-backed real time clock
         ``soft'' power button as available on SGI O2 (power)
-        Moosehead A/V Board audio (mavb)
-        built-in SGI Graphics Back End framebuffer (gbe)
-        built-in PS/2 Controller (mkbc)
+        O2 Moosehead A/V Board audio (mavb)
+        O2 built-in Graphics Back End framebuffer (gbe)
+        O2 built-in PS/2 Controller (mkbc)
                 PS/2 mice (pms)
                 PS/2 keyboards (pckbd)
 
 If your hardware is not listed above, there is currently no support for it
 in this release.
-
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index 73516d357db..de14dabcd16 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.16 2009/05/13 18:38:29 miod Exp $
+dnl	$OpenBSD: install,v 1.17 2009/05/30 05:00:37 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -14,19 +14,25 @@ dhcpd(8) manual page on your server should provide detailed information
 on how to set up the server.
 
 The bootp or dhcp server needs to know the ethernet address of the
-system. This address can be found by using the ``printenv'' command
-in the Maintenance Console, looking for the ``eaddr'' variable.
+system. On O2 systems, this address can be found by using the ``printenv''
+command in the Maintenance Console, looking for the ``eaddr'' variable.
+On other systems, this address is ususally written on a factory sticker
+on the back of the machine.
 
-The server should also provide a tftp location, where the bsd.rd file
-should be available.
+The server should also provide a tftp location, where the proper bsd.rd
+file should be available.
 
 Once the server is set up, boot with the following command in the
 Maintenance Console:
 
-> bootp()/bsd.rd
+> bootp()/bsd.rd.IP32
+
+(replacing `IP32' by the family name suitable for your machine).
 
 Booting from CD-ROM installation media:
 
+(Note: this boot method only works on IP32 systems at the moment).
+
 From the System Maintenance Menu, select '2' (or click on the
 appropriate icon if in graphics console) to Install System Software.
 
diff --git a/distrib/notes/sgi/prep b/distrib/notes/sgi/prep
index 2228f0faa5a..d2289355005 100644
--- a/distrib/notes/sgi/prep
+++ b/distrib/notes/sgi/prep
@@ -1,6 +1,34 @@
-dnl	$OpenBSD: prep,v 1.12 2008/08/06 18:23:56 miod Exp $
-Before you install your system, you should familiarize yourself with the
-ARCBios setup and how to run programs from the Command monitor prompt.
+dnl	$OpenBSD: prep,v 1.13 2009/05/30 05:00:37 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.
+
+Identifying your system:
+
+    Due to significant design differences in SGI systems, OpenBSD
+    needs to use different kernels, depending on the system family.
+
+    There are currently four system families supported by OpenBSD:
+
+    IP27 family:
+	Origin 200, Onyx 2
+	Origin 2000
+
+    IP30 family:
+	Octane, Octane 2
+
+    IP32 family:
+	O2, O2+
+
+    IP35 family:
+	Origin 300, Origin 3000, Onyx 300
+dnl	Origin 350, Onyx 350, Onyx 4
+	Fuel
+dnl	Tezro
+
+    You should use the kernels (bsd and bsd.rd) with the IP suffix
+    matching your family number, except for IP35 systems which use
+    IP27 kernels.
 
 Accessing the Maintenance Console:
 
@@ -34,6 +62,10 @@ Switching from serial to graphics console and vice versa:
 
     will select the graphics console.
 
+    Only IP32 family systems are supported with a graphis console
+    under OpenBSD at the moment. On all other non-headless systems,
+    you need to change the console to serial.
+
 Setting the environment:
 
     When setting up the system to boot from disk, the ``OSLoader''
@@ -45,21 +77,3 @@ Setting the environment:
     Also, by default it tries to boot a kernel named ``/unix''. To
     make it boot OpenBSD, set ``OSLoadFilename'' to ``/bsd''.
 
-Disk numbering
-
-    SGI numbers their disks 1-n depending on their position in the
-    backplane. For example, on the O2, the slot closest to the CPU
-    is numbered 1 and the next 2 if the CPU is a R5000. On R1x000
-    models, slot 1 is lost due to the larger heatsink on the CPU.
-    Normally the kernel translates the slot numbers to disk numbers
-    by subtracting 1 from the slot number, eg slot 1 becomes sd0.
-    However on an O2 with a R1x000 cpu, 2 is subtracted from the
-    slot number to compensate for the lost slot.
-
-    When the kernel searches for the boot device it uses the ARCBios
-    environment variable OSLoadPartition. Since the disk number in
-    the variable is the absolute number, in contrast to the kernels
-    relative numbers, the kernel will not be able to find the boot
-    device if the disk slots are not filled from the lowest and up.
-    An empty slot before the boot device will confuse the lookup.
-
diff --git a/distrib/notes/sgi/whatis b/distrib/notes/sgi/whatis
index 444780feea9..5ae9f4301fa 100644
--- a/distrib/notes/sgi/whatis
+++ b/distrib/notes/sgi/whatis
@@ -1,3 +1,4 @@
-dnl	$OpenBSD: whatis,v 1.3 2005/03/18 13:29:46 miod Exp $
+dnl	$OpenBSD: whatis,v 1.4 2009/05/30 05:00:37 miod Exp $
 
-OpenBSD/MACHINE runs on the SGI O2 workstations.
+OpenBSD/MACHINE runs on several SGI workstations and servers, including
+the O2, Octane, Origin/Onyx and Fuel/Tezro families.