Sync with recent changes.

2 files changed, 20 insertions, 19 deletions

diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index ee7ad2c5bb9..6ca661605f9 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -1,36 +1,36 @@
-dnl	$OpenBSD: hardware,v 1.15 2008/08/06 18:23:56 miod Exp $
+dnl	$OpenBSD: hardware,v 1.16 2009/02/17 22:37:43 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- MVME147 - Motorola with 68030 and 68881
 	- MVME162 - Motorola with 68040 and IndustryPack slots
 	- MVME167 - Motorola with 68040
-dnl 172 support is not complete
-dnl	- MVME172 - Motorola with 68060 and IndustryPack slots
+dnl 172 support is not tested
+	- MVME172 - Motorola with 68060 and IndustryPack slots
 	- MVME177 - Motorola with 68060
 
-The minimal configuration requires 8MB of RAM and ~160MB of disk space. To
+The minimal configuration requires 12MB of RAM and ~160MB of disk space. To
 install the entire system requires much more disk space, and to compile the
-system, more RAM is recommended.  Note that until you have 16MB of RAM,
+system, more RAM is recommended.  Note that until you have 32MB of RAM,
 getting more RAM is more important than getting a faster CPU board.
 
 Supported devices {:-include-:}:
 
 MVME147:
 	serial ports:
-		on-board ttya-ttyd
+		on-board ttya-ttyd (zs)
 	Ethernet:
 		on-board AMD 7990 Lance Ethernet (le)
 	SCSI:
-		on-board WD33C93 controller
+		on-board WD33C93 controller (wdsc)
 	VMEbus:
 		not supported (some cards have issues)
 
 MVME162, MVME172:
 	serial ports:
-		on-board tty00-03 - Zilog Z85230 SCC
+		on-board tty00-03 - Zilog Z85230 SCC (zs)
 	Ethernet:
 		on-board Intel 82596CA Ethernet (ie)
 	SCSI:
-		on-board NCR53c710 controller
+		on-board NCR53c710 controller (osiop)
 	VMEbus:
 		drivers for short I/O access (untested)
 	Flash:
@@ -45,21 +45,22 @@ MVME162, MVME172:
 
 MVME167, MVME177:
 	serial ports:
-		on-board tty00 - tty03 - Cirrus Logic CD2401
+		on-board tty00 - tty03 - Cirrus Logic CD2401 (cl)
 	Ethernet:
 		on-board Intel 82596CA Ethernet (ie)
 	SCSI:
-		on-board NCR53c710 controller
+		on-board NCR53c710 controller (osiop)
 	SRAM:
 		supported
 	VMEbus:
 		supported
 		
-
 Faithful clones of the above boards should also work.
 
-Additional VMEbus devices supported by the OpenBSD/MACHINE port {:-include-:}:
-
-	MVME328 SCSI controller (vs)
+Additional VMEbus devices:
 
-	MVME376 VME bus Ethernet (le)
+	MVME327A SCSI and floppy Controller (vsbic), currently limited
+	    to the SCSI interface only, and supported on 68060 systems
+	MVME328 High Performance SCSI Controller (vs)
+dnl	MVME332XT High Performance Serial I/O Controller (vx)
+	MVME376 Ethernet Communications Controller (le)
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index e87b405d89e..d228fc06dee 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.31 2008/08/05 22:58:01 miod Exp $
+dnl	$OpenBSD: install,v 1.32 2009/02/17 22:37:43 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -203,11 +203,11 @@ and send their contents over the serial link, such as cu(1) and tip(1) - both
 being available on OpenBSD - the MACHINE workstation should be put in
 S-Records receive mode, with the LO command at the BUG prompt:
 
-    147-Bug> LO
+    147-Diag> LO
 
 If this command prints an error message and returns to the BUG prompt
 immediately, it might be necessary to switch directories, using the SD
-command, before retrying.
+command (the prompt will change from 147-Bug to 147-Diag), before retrying.
 
 Then, the contents of the ``sboot'' file should be sent From the terminal
 emulator. Depending on the speed of the serial link, this will take some