More details about the dreaded netaddr environment variable for network

boot, and about the console madness on machines with an external L1 serial
port.

3 files changed, 49 insertions, 10 deletions

diff --git a/distrib/notes/sgi/hardware b/distrib/notes/sgi/hardware
index 7c5d7945770..7fbbd589aee 100644
--- a/distrib/notes/sgi/hardware
+++ b/distrib/notes/sgi/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.7 2009/05/30 23:56:05 miod Exp $
+dnl	$OpenBSD: hardware,v 1.8 2009/10/10 19:20:28 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following machines:
 	IP27 class machines:
 		Origin 200, Onyx 2
@@ -13,13 +13,20 @@ OpenBSD/MACHINE OSREV runs on the following machines:
 		 are supported)
 	IP35 class machines:
 		Origin 300, Origin 3000, Onyx 300
-dnl		Origin 350, Onyx 350, Onyx 4
+		Origin 350, Onyx 350, Onyx 4
 		Fuel
-dnl		Tezro
+		Tezro
 
 Supported devices {:-include-:}:
 - Ethernet Adapters
         built-in O2 Mace Ethernet Controller (mec)
+	Broadcom BCM570x (a.k.a. Tigon3) based PCI adapters (bge) including:
+		3Com 3c996-SX
+		3Com 3c996B-T
+		HP ProLiant NC7770 PCI-X Gigabit NIC
+		Netgear GA302T
+		SysKonnect SK-9D21
+		SysKonnect SK-9D41
         Intel/DEC 21443 "Tulip" clones (dc)
 	3Com EtherLink III and Fast EtherLink III Ethernet (ep)
         Intel i8255x-based (fxp) including:
@@ -35,7 +42,7 @@ Supported devices {:-include-:}:
 	3Com EtherLink XL and Fast EtherLink XL (xl)
 - SCSI Host Adapters
         O2 built-in Adaptec AIC-7880 (ahc)
-	IP27/IP30/IP32 built-in QLogic ISP (isp)
+	IP27/IP30/IP32/IP35 built-in QLogic ISP (isp)
         LSI Logic Fusion-MPT Message Passing Interface (mpi)
         53C8xx-based SCSI (siop)
 - RS-232 devices
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index de14dabcd16..f21b98a12ef 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.17 2009/05/30 05:00:37 miod Exp $
+dnl	$OpenBSD: install,v 1.18 2009/10/10 19:20:28 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -13,6 +13,15 @@ First, a bootp or dhcpd server needs to be set up. The bootpd(8) or
 dhcpd(8) manual page on your server should provide detailed information
 on how to set up the server.
 
+The PROM, by default, will configure itself to use the IP address set in
+the `netaddr' environment variable. To force the PROM to always get an
+address from a bootp or dhcp server, clear the variable (`unsetenv netaddr')
+before attempting to boot from the network. Alternatively, you may want to
+make sure the value of this variable is correct.
+
+Note that, if the `netaddr' variable is unset, the PROM will initialize it
+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 O2 systems, this address can be found by using the ``printenv''
 command in the Maintenance Console, looking for the ``eaddr'' variable.
diff --git a/distrib/notes/sgi/prep b/distrib/notes/sgi/prep
index 664ce24fd18..99790a534e1 100644
--- a/distrib/notes/sgi/prep
+++ b/distrib/notes/sgi/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.14 2009/08/02 17:08:13 jasper Exp $
+dnl	$OpenBSD: prep,v 1.15 2009/10/10 19:20:29 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 @@ Identifying your system:
 
     IP35 family:
 	Origin 300, Origin 3000, Onyx 300
-dnl	Origin 350, Onyx 350, Onyx 4
+	Origin 350, Onyx 350, Onyx 4
 	Fuel
-dnl	Tezro
+	Tezro
 
     You should use the kernels (bsd and bsd.rd) with the IP suffix
     matching your family number, except for IP35 systems which use
@@ -53,12 +53,12 @@ Switching from serial to graphics console and vice versa:
     and change the ``console'' environment variable, and power-cycle
     the machine.
 
-    > setenv console d
+    >> setenv console d
 
     will select 9600 8N1, no flow control, serial console on the first
     serial port (labeled ``(1)''), while
 
-    > setenv console g
+    >> setenv console g
 
     will select the graphics console.
 
@@ -66,6 +66,29 @@ Switching from serial to graphics console and vice versa:
     under OpenBSD at the moment. On all other non-headless systems,
     you need to change the console to serial.
 
+Switching from L1 console to serial console and vice versa:
+
+    IP35 systems without a graphics console can have the PROM console output
+    either on the L1 console serial port, or the regular serial port. 
+
+    The `console' command at the PROM prompt, can select between them:
+    >> console sc
+    will switch to the L1 serial port, while
+    >> console ioc3
+    or
+    >> console ioc4
+    will select the regular serial port, depending on the I/O board type.
+
+    On Fuel systems, there is no external L1 serial port, so `console sc'
+    should never be used on these machines.
+
+    Origin 300 and 3000 families can switch between `sc' and `ioc3', while
+    Origin 350 and 3500 families can switch between `sc' and `ioc4'.
+
+    The OpenBSD kernel only supports serial console on the regular serial
+    ports; if your PROM console is on the L1 port, the kernel console will
+    nevertheless pick the first IOC3 or IOC4 serial port.
+
 Setting the environment:
 
     When setting up the system to boot from disk, the ``OSLoader''