MD installation notes updates for 3.4, 3/3

Describe with much more details how to successfully boot from various
devices, including non-built-in ethernet or SCSI controllers; also hint
that most of the MVME147 and the MVME187 can not netboot at all.

This should be much, much more understandable (but we need to run this
through a drunk pvalchev@ to be sure).

6 files changed, 415 insertions, 114 deletions

diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index 270a3121b2a..e0e4e1f764a 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.11 2003/06/21 01:06:00 miod Exp $
+dnl	$OpenBSD: hardware,v 1.12 2003/09/06 23:34:00 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
@@ -35,7 +35,7 @@ MVME162, MVME172:
 	VMEbus:
 		drivers for short I/O access (untested)
 	Flash:
-		1 MB flash, either Intel 28F008SA or 28F020
+		1MB flash, either Intel 28F008SA or 28F020
 		A driver is available, but doesn't work correctly.
 		Jumper GPIO3 selects Flash memory map and must
 		be installed for booting with the Flash driver (default)
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index d3b691e6397..d3dbb1b1755 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.21 2003/06/22 00:37:57 miod Exp $
+dnl	$OpenBSD: install,v 1.22 2003/09/06 23:34:00 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -34,17 +34,47 @@ Booting from SCSI tape:
 
 Bootable tapes can be booted with the following command at the prompt:
 
-	167-bug> bo xx yy
+    167-Bug> BO xx yy
 
 Where `xx' is the SCSI controller number (00 for the built-in SCSI
-controller), and `yy' is ten times the tape drive ID, except for the
-MVME147, where `xx' should be the tape drive ID, and `yy' should be 00.
-
-For example, booting from a tape drive using SCSI id 4:
-	147-bug> bo 04 00
+controller), and `yy' is the encoding for the SCSI device ID, which varies
+between controllers.
+
+Recent BUG can list the available disk and tape controllers, using the
+"IOT;H" command:
+
+    167-Bug>IOT;H
+    I/O Controllers Available:
+    CLUN  CNTRL-TYPE  CNTRL-Address  N-Devices
+       0  VME167      $FFF47000      *
+       6  VME328      $FFFF9000      *
+
+In this example, the built-in controller, as well as an external MVME328
+controller, are available.
+
+The encoding for the drive ID is as follows:
+- built-in controller and MVME327 SCSI controller:
+    'yy' is ten times the device ID.
+- MVME328 SCSI controller:
+    'yy' is eight times the devic ID, written in hexadecimal
+- MVME350 tape controller:
+    'yy' is always zero, as this controller only supports one tape drive.
+
+MVME147 boards are slightly different, as they only support booting from
+the built-in SCSI controller (if present), using the following convention:
+- 'xx' is the device ID.
+- 'yy' is zero.
+
+For example, booting from a tape drive using SCSI ID #4:
+    147-Bug> BO 04 00
 for a MVME147, and
-	167-bug> bo 00 40
-for any other MACHINE board.
+    167-Bug> BO 00 40
+for any other MACHINE board using the built-in controller. However, a tape
+drive connected to an MVME328 board using SCSI ID #5, will be booted as:
+    167-Bug> BO 06 28
+
+Note that OpenBSD/MACHINE can boot off any tape drive supported by the BUG,
+even if its controller is not supported by OpenBSD.
 
 
 Installing using a diskless setup:
@@ -59,14 +89,105 @@ SunOS systems, add_client(8) and the Sun System/Networks administrators
 guide constitute a good start; on Solaris systems, share(1M) is a good
 starting point as well).
 
-Second, the MACHINE workstation should then be setup using the NIOT command
-at the BUG prompt. The ``Load Address'' value should be 0x6F0000, and the
-``Execution Address'' value should be 0x6F0000 as well.
-
-Then, it should be possible to boot the machine from the server by entering
-the NBO command at the BUG prompt:
+OpenBSD/MACHINE can boot off any network card supported by the BUG, even
+if the card itself is not supported by OpenBSD. The list of BUG-supported
+network controllers is available with the "NIOT;A" command. For example:
+
+    167-Bug> NIOT;A
+    Network Controllers/Nodes Supported
+    CLUN  DLUN  Name      Address
+       0     0  VME167    $FFF46000
+       2     0  VME376    $FFFF1200
+       3     0  VME376    $FFFF1400
+       4     0  VME376    $FFFF1600
+       5     0  VME376    $FFFF5400
+       6     0  VME376    $FFFF5600
+       7     0  VME376    $FFFFA400
+      10     0  VME374    $FF000000
+      11     0  VME374    $FF100000
+      12     0  VME374    $FF200000
+      13     0  VME374    $FF300000
+      14     0  VME374    $FF400000
+      15     0  VME374    $FF500000
+
+The "NIOT;H" lists only the available controllers in the machine. For
+example, if no external network card is present, only the built-in
+controller will be reported:
+
+    167-Bug> NIOT;A
+    Network Controllers/Nodes Available
+    CLUN  DLUN  Name      Address
+       0     0  VME167    $FFF46000
+
+If the BUG does not support the NIOT command (most MVME147 don't), then
+it has no support for netbooting, and you'll have to use S-Records,
+described later in this document.
+
+Before netbooting, enter "NIOT" and fill the parametrs. Be sure to provide
+the correct values for Controller LUN and Device LUN (as listed in the
+"NIOT;A" output); also the "Boot File Load Address" and "Boot File
+Execution Address" need to be set to 006F0000. The "Boot File Name" must
+match the name of the netboot file on the server (copying it as
+"netboot.mvme68k" is usually a wise choice). Finally, "Argument File Name"
+needs to be set to "bsd.rd" in order to boot the installation miniroot,
+rather than the regular kernel.
+
+Here are acceptable values for a 167 card using the built-in controller:
+
+    167-Bug> NIOT
+    Controller LUN =00? 
+    Device LUN     =00? 
+    Node Control Memory Address =01FF0000? 
+    Client IP Address      =0.0.0.0? 
+    Server IP Address      =0.0.0.0? 
+    Subnet IP Address Mask =255.255.255.0? 
+    Broadcast IP Address   =255.255.255.255? 
+    Gateway IP Address     =0.0.0.0? 
+    Boot File Name ("NULL" for None)     =? netboot.mvme68k
+    Argument File Name ("NULL" for None) =? bsd.rd
+    Boot File Load Address         =001F0000? 006F0000
+    Boot File Execution Address    =001F0000? 006F0000
+    Boot File Execution Delay      =00000000? 
+    Boot File Length               =00000000? 
+    Boot File Byte Offset          =00000000? 
+    BOOTP/RARP Request Retry       =00? 
+    TFTP/ARP Request Retry         =00? 
+    Trace Character Buffer Address =00000000? 
+    BOOTP/RARP Request Control: Always/When-Needed (A/W)=W? 
+    BOOTP/RARP Reply Update Control: Yes/No (Y/N)       =Y? 
+
+If you change the NIOT configuration, you will be asked whether you want to
+make these changes permanent. Do not answer Y unless you plan to netboot
+this board very often; be sure to have the ENV settings use a correct
+address for the NIOT parameters block in this case. A valid setting is:
+
+    Network Auto Boot Configuration Parameters Pointer (NVRAM) =
+        00000000? FFFC0080
+
+for example.
+
+Once the NIOT parameters are set, it should be possible to boot the machine
+from the server with the NBO command. However, in some cases, netbooting
+will prevent the OpenBSD kernel from probing the built-in SCSI controller
+(if any) properly, so it is recommended to do a disk probe first:
+
+    167-Bug> IOI;C
+    167-Bug> IOI
+
+This can take up to a couple of minutes, depending how many SCSI controllers
+are found in the machine. Once the BUG prompt is back, you can safely
+netboot:
 	
-	167-bug> nbo 00 00 bsd.rd
+    167-Bug> NBO 00 00
+
+or if you know the IP address for the MACHINE and the diskless server,
+you can directly provide the boot loader's filename and the kernel name
+on the commandline:
+
+     167-Bug> NBO 00 00 192.168.0.68 192.168.0.1 netboot.mvme68k bsd.rd
+
+where, in this example, 192.168.0.68 is the address of the MACHINE computer,
+and 192.168.0.1 the address of the diskless server.
 
 If the BUG version does not understand the NIOT and NBO commands (most
 MVME147 don't), the alternative is to boot from S-Records.
@@ -82,7 +203,7 @@ 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 prompr:
 
-	147-bug> LO
+    147-Bug> LO
 
 If this command prints an error messages and returns to the BUG prompt
 immediately, it might be necessary to switch directories, using the SD
@@ -169,14 +290,16 @@ syslog and tcpdump(8) to get visibility of what's happening (or not).
 
 Your MACHINE expects to be able to download a second stage bootstrap
 program via TFTP after having acquired its IP address through RevARP when
-instructed to boot "over the net". It will look for a filename composed of
-the machine's IP address, followed by the machine's architecture, separated
-by a period. For example, a MACHINE board which has been assigned IP
-address 130.115.144.11, will make an TFTP request for `8273900B.MACHINE'.
+instructed to boot "over the net". If you are booting from S-Records, it
+will look for a filename composed of the machine's IP address, followed by
+the machine's architecture, separated by a period (for example, a MACHINE
+board which has been assigned IP address 130.115.144.11, will make an TFTP
+request for `8273900B.MACHINE'); if you are booting from the NBO command,
+you can specify the filename which will be looked for.
+
 Normally, this file is a symbolic link to an appropriate second-stage
 boot program, which should be located in a place where the TFTP daemon
 can find it (remember, many TFTP daemons run in a chroot'ed environment).
-
 You can find the boot program in `/usr/mdec/netboot' in the OpenBSD/MACHINE
 distribution.
 
diff --git a/distrib/notes/mvme68k/prep b/distrib/notes/mvme68k/prep
index 7d3a026c612..b263fd5ac5e 100644
--- a/distrib/notes/mvme68k/prep
+++ b/distrib/notes/mvme68k/prep
@@ -1,12 +1,44 @@
+dnl	$OpenBSD: prep,v 1.6 2003/09/06 23:34:00 miod Exp $
 Before installing OpenBSD on your machine, you will want to check your
-machine's NVRAM settings.
+machine's NVRAM settings, from the BUG.
+
+The BUG provides a simple syntax reminder for every command, as well as
+description of the commands; if you need help, just use
+
+    167-Bug> HE
+
+for a command list, or
+
+    167-Bug> HE FOO
+
+for help on a specific command.
+
+If you are located in the diagnostics directory (with a prompt in -Diag>
+rather than -Bug>), be sure to revert to the normal Bug operating mode
+with the SD command:
+
+     167-Diag> SD
+     167-Bug>
 
 The defaults settings are usually suitable for OpenBSD; make sure the
 environment is configured in BUG mode. You can check and change this with
-the ENV command.
+the ENV command. Ideally, the first two items of the ENV data will be as
+follows:
+
+    167-Bug> ENV
+    Bug or System environment [B/S] = B? 
+    Field Service Menu Enable [Y/N] = N? 
+
+in order to boot directly into the BUG, without executing the complete
+selftest sequence. Do not forget, after changing the ENV parameters, to
+save the changes in NVRAM as suggested by the ENV command itself.
 
-You will need to check that the ethernet address is correct as well, with
-the LSAD command.
+If the board has a built-in ethernet controller, its address must be correct;
+the LSAD command allows the address to be edited.
+
+OpenBSD/MACHINE will not run correctly if the clock is stopped (power-saving
+mode). Be sure to check that it is running by setting the current date with
+the SET command.
 
 Some models also require specific preparation:
 MVME147:
@@ -14,14 +46,11 @@ MVME147:
 	be zero if you don't have any VMEBus memory cards. You can change
 	its value with the MM command.
 
-MVME162:
-	Be sure to use the SET command to set the date before trying
-	to use the ethernet support in the 162-Bug.
-
-If you plan to boot from the network, make sure your ENV settings match
-the following setup:
+If you plan to permanently boot from the network, make sure your ENV settings
+match the following setup:
 
-Network Auto Boot Enable [Y/N]   = N? y
-Network Auto Boot at power-up only [Y/N] = Y? n
-Network Auto Boot Abort Delay    = 5? 2
-Network Auto Boot Configuration Parameters Pointer (NVRAM) = 00000000? fffc0080
+    Network Auto Boot Enable [Y/N]   = N? Y
+    Network Auto Boot at power-up only [Y/N] = Y? N
+    Network Auto Boot Abort Delay    = 5? 2 (or any value at your choice)
+    Network Auto Boot Configuration Parameters Pointer (NVRAM) =
+        00000000? FFFC0080
diff --git a/distrib/notes/mvme88k/hardware b/distrib/notes/mvme88k/hardware
index e7b56323fc4..17a63ba04ce 100644
--- a/distrib/notes/mvme88k/hardware
+++ b/distrib/notes/mvme88k/hardware
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: hardware,v 1.3 2003/08/10 21:04:06 miod Exp $
+dnl	$OpenBSD: hardware,v 1.4 2003/09/06 23:34:01 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- MVME187 - Single board computer with 88100 processor
 	- Motorola 8120 - non expandable MVME187
 
-The minimal configuration requires 8M of RAM and ~250M of disk space.
+The minimal configuration requires 16MB of RAM and ~250M of disk space.
 To install the entire system requires much more disk space, and to
 compile the system, more RAM is recommended.
 
diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install
index 017298ab8b5..091a60026c5 100644
--- a/distrib/notes/mvme88k/install
+++ b/distrib/notes/mvme88k/install
@@ -1,16 +1,16 @@
-dnl	$OpenBSD: install,v 1.9 2003/08/10 21:04:06 miod Exp $
+dnl	$OpenBSD: install,v 1.10 2003/09/06 23:34:01 miod Exp $
 OpenBSDInstallPrelude
 
-There are several ways to install OpenBSD onto a disk. The easiest way in
-terms of preliminary setup is to use the OpenBSD ramdisk kernel that can be
-booted from tape.
+There are several ways to install OpenBSD onto a disk. The easiest way
+in terms of preliminary setup is to use the OpenBSD ramdisk kernel that can
+be booted from tape.
 
-Alternatively, if your MACHINE is hooked up in a network, it is possible to
-setup another machine as a server for diskless setup, which is a convenient
-way to install on a machine whose disk does not currently hold a usable
-operating system.
-This is difficult to get set up correctly the first time, but easy to use
-afterwards (see the section `Installing using a diskless setup' below).
+Alternatively, if the MACHINE is hooked up in a network, it is possible
+to setup another machine as a server for diskless setup, which is a
+convenient way to install on a machine whose disk does not currently
+hold a usable operating system.
+This is difficult to get set up correctly the first time, but easy to
+use afterwards.  (See ``Installing using a diskless setup'' below).
 
 
 Booting from the Installation Media:
@@ -19,53 +19,172 @@ Prior to attempting an installation, everything of value on the target
 system should be backed up.  While installing OpenBSD does not necessarily
 wipe out all the partitions on the hard disk, errors during the install
 process can have unforeseen consequences and will probably leave the system
-unbootable if the installation process is not completed. Availability of the
-installation media for the prior installation, such as a Motorola
-SystemV/MACHINE tape is always a good insurance, should it be necessary to
-"go back" for some reason.
+unbootable if the installation process is not completed. Availability
+of the installation media for the prior installation, such as a Motorola
+SystemV/MACHINE tape is always a good insurance, should it be necessary
+to "go back" for some reason.
 
 After taking care of all that, the system should be brought down gracefully
-using the shutdown(8) and/or halt(8) commands, which will eventually go bakc
-to the ``BUG>'' prompt (it may be necessary to send a break if the system is
-completely halted).
+using the shutdown(8) and/or halt(8) commands, which will eventually go
+bakc to the ``BUG>'' prompt (it may be necessary to send a break if the
+system is completely halted).
 
 
 Booting from SCSI tape:
 
-dnl XXX 188 does not have built-in devices - will need quite a whack once
+dnl XXX 188 does not have built-in devices - will need slight changes once
 dnl 188 support is back.
 Bootable tapes can be booted with the following command at the prompt:
 
-	187-Bug> bo xx yy
+    187-Bug> BO xx yy
 
 Where `xx' is the SCSI controller number (00 for the built-in SCSI
-controller), and `yy' is ten times the tape drive ID.
+controller), and `yy' is the encoding for the SCSI device ID, which varies
+between controllers.
 
-For example, booting from a tape drive using SCSI id 4 on the built-in
-controller:
-	187-Bug> bo 00 40
+Recent BUG can list the available disk and tape controllers, using the
+"IOT;H" command:
+
+    187-Bug>IOT;H
+    I/O Controllers Available:
+    CLUN  CNTRL-TYPE  CNTRL-Address  N-Devices
+       0  VME187      $FFF47000      *
+       6  VME328      $FFFF9000      *
+
+In this example, the built-in controller, as well as an external MVME328
+controller, are available.
+
+The encoding for the drive ID is as follows:
+- built-in controller and MVME327 SCSI controller:
+    'yy' is ten times the device ID.
+- MVME328 SCSI controller:
+    'yy' is eight times the devic ID, written in hexadecimal
+- MVME350 tape controller:
+    'yy' is always zero, as this controller only supports one tape drive.
+
+For example, booting from a tape drive using SCSI ID #5 will be done with:
+    187-Bug> BO 00 50
+using the built-in controller, but with:
+    187-Bug> BO 06 28
+using an MVME328 board.
+
+Note that OpenBSD/MACHINE can boot off any tape drive supported by the BUG,
+even if its controller is not supported by OpenBSD.
 
 
 Installing using a diskless setup:
 
-First, a diskless client configuration should be setup on a server. If the
-boot server is an OpenBSD system, the diskless(8) manual page will provide
-detailed information on the process.
+First, a diskless client configuration should be setup on a server. If
+the boot server is an OpenBSD system, the diskless(8) manual page will
+provide detailed information on the process.
 
 If the server runs another operating system, the setup instructions will
-likely be available as part of the documentation that came with it (on SunOS
-systems, add_client(8) and the Sun System/Networks administrators guide
-constitute a good start; on Solaris systems, share(1M) is a good starting
-point as well).
+likely be available as part of the documentation that came with it (on
+SunOS systems, add_client(8) and the Sun System/Networks administrators
+guide constitute a good start; on Solaris systems, share(1M) is a good
+starting point as well).
+
+OpenBSD/MACHINE can boot off any network card supported by the BUG, even
+if the card itself is not supported by OpenBSD. The list of BUG-supported
+network controllers is available with the "NIOT;A" command. For example:
+
+    187-Bug> NIOT;A
+    Network Controllers/Nodes Supported
+    CLUN  DLUN  Name      Address
+       0     0  VME187    $FFF46000
+       2     0  VME376    $FFFF1200
+       3     0  VME376    $FFFF1400
+       4     0  VME376    $FFFF1600
+       5     0  VME376    $FFFF5400
+       6     0  VME376    $FFFF5600
+       7     0  VME376    $FFFFA400
+      10     0  VME374    $FF000000
+      11     0  VME374    $FF100000
+      12     0  VME374    $FF200000
+      13     0  VME374    $FF300000
+      14     0  VME374    $FF400000
+      15     0  VME374    $FF500000
+
+The "NIOT;H" lists only the available controllers in the machine. For
+example, if no external network card is present, only the built-in
+controller will be reported:
+
+    187-Bug> NIOT;A
+    Network Controllers/Nodes Available
+    CLUN  DLUN  Name      Address
+       0     0  VME187    $FFF46000
+
+If the BUG does not support the NIOT command (most MVME187 don't), then
+it has no support for netbooting.
+
+Before netbooting, enter "NIOT" and fill the parametrs. Be sure to provide
+the correct values for Controller LUN and Device LUN (as listed in the
+"NIOT;A" output); also the "Boot File Load Address" and "Boot File
+Execution Address" need to be set to 00AF0000. The "Boot File Name" must
+match the name of the netboot file on the server (copying it as
+"netboot.mvme88k" is usually a wise choice). Finally, "Argument File Name"
+needs to be set to "bsd.rd" in order to boot the installation miniroot,
+rather than the regular kernel.
+
+Here are acceptable values for a 187 card using the built-in controller:
+
+    187-Bug> NIOT
+    Controller LUN =00? 
+    Device LUN     =00? 
+    Node Control Memory Address =01FF0000? 
+    Client IP Address      =0.0.0.0? 
+    Server IP Address      =0.0.0.0? 
+    Subnet IP Address Mask =255.255.255.0? 
+    Broadcast IP Address   =255.255.255.255? 
+    Gateway IP Address     =0.0.0.0? 
+    Boot File Name ("NULL" for None)     =? netboot.mvme88k
+    Argument File Name ("NULL" for None) =? bsd.rd
+    Boot File Load Address         =001F0000? 00AF0000
+    Boot File Execution Address    =001F0000? 00AF0000
+    Boot File Execution Delay      =00000000? 
+    Boot File Length               =00000000? 
+    Boot File Byte Offset          =00000000? 
+    BOOTP/RARP Request Retry       =00? 
+    TFTP/ARP Request Retry         =00? 
+    Trace Character Buffer Address =00000000? 
+    BOOTP/RARP Request Control: Always/When-Needed (A/W)=W? 
+    BOOTP/RARP Reply Update Control: Yes/No (Y/N)       =Y? 
+
+If you change the NIOT configuration, you will be asked whether you want to
+make these changes permanent. Do not answer Y unless you plan to netboot
+this board very often; be sure to have the ENV settings use a correct
+address for the NIOT parameters block in this case. A valid setting is:
+
+    Network Auto Boot Configuration Parameters Pointer (NVRAM) =
+        00000000? FFFC0080
+
+for example.
+
+Once the NIOT parameters are set, it should be possible to boot the machine
+from the server with the NBO command. However, in some cases, netbooting
+will prevent the OpenBSD kernel from probing the built-in SCSI controller
+(if any) properly, so it is recommended to do a disk probe first:
+
+    187-Bug> IOI;C
+    187-Bug> IOI
+
+This can take up to a couple of minutes, depending how many SCSI controllers
+are found in the machine. Once the BUG prompt is back, you can safely
+netboot:
+	
+    187-Bug> NBO 00 00
 
-Second, the MACHINE workstation should then be setup using the NIOT command
-at the BUG prompt. The ``Load Address'' value should be 0xAF0000, and the
-``Execution Address'' value should be 0xAF0000 as well.
+or if you know the IP address for the MACHINE and the diskless server,
+you can directly provide the boot loader's filename and the kernel name
+on the commandline:
 
-Then, it should be possible to boot the machine from the server by entering
-the NBO command at the BUG prompt:
-	
-	187-Bug> nbo 00 00 bsd.rd
+     187-Bug> NBO 00 00 192.168.0.68 192.168.0.1 netboot.mvme88k bsd.rd
+
+where, in this example, 192.168.0.68 is the address of the MACHINE computer,
+and 192.168.0.1 the address of the diskless server.
+
+If the BUG version does not understand the NIOT and NBO commands (most
+MVME187 don't), there is currently no way to netboot.
 
 
 
@@ -124,39 +243,37 @@ uses NFS to access the exported root partition, while the OpenBSD bootblocks
 use internal NFS routines to load the kernel image directly from the
 exported root partition.
 
-Please understand that no one gets this right the first try, since there is
-a lot of setup and all the host daemons must be running and configured
-correctly.  If you have problems, extract the diskless(8) manpage, find
-someone who's been through it before and use the host syslog and tcpdump(8)
-to get visibility of what's happening (or not).
-
-Your MACHINE expects to be able to download a second stage bootstrap program
-via TFTP after having acquired its IP address through RevARP when instructed
-to boot "over the net". It will look for a filename composed of the
-machine's IP address, followed by the machine's architecture, separated by a
-period. For example, a MACHINE board which has been assigned IP address
-130.115.144.11, will make an TFTP request for `8273900B.MACHINE'. Normally,
-this file is a symbolic link to an appropriate second-stage boot program,
-which should be located in a place where the TFTP daemon can find it
-(remember, many TFTP daemons run in a chroot'ed environment).
+Please understand that no one gets this right the first try, since
+there is a lot of setup and all the host daemons must be running and
+configured correctly.  If you have problems, extract the diskless(8)
+manpage, find someone who's been through it before and use the host
+syslog and tcpdump(8) to get visibility of what's happening (or not).
+
+Your MACHINE expects to be able to download a second stage bootstrap
+program via TFTP after having acquired its IP address through RevARP when
+instructed to boot "over the net". It will look for the filename specified
+on the NBO commandline, or via the NIOT parameters.
 
+Normally, this file is a symbolic link to an appropriate second-stage
+boot program, which should be located in a place where the TFTP daemon
+can find it (remember, many TFTP daemons run in a chroot'ed environment).
 You can find the boot program in `/usr/mdec/netboot' in the OpenBSD/MACHINE
 distribution.
 
-After the boot program has been loaded into memory and given control by the
-BUG, it starts locating the machine's remote root directory through the
-BOOTPARAM protocol. First a BOOTPARAM WHOAMI request is broadcast on the
-local net. The answer to this request (if it comes in) contains the client's
-name. This name is used in next step, a BOOTPARAM GETFILE request -- sent to
-the server that responded to the WHOAMI request -- requesting the name and
-address of the machine that will serve the client's root directory, as well
-as the path of the client's root on that server.
+After the boot program has been loaded into memory and given control by
+the BUG, it starts locating the machine's remote root directory through
+the BOOTPARAM protocol. First a BOOTPARAM WHOAMI request is broadcast
+on the local net. The answer to this request (if it comes in) contains
+the client's name. This name is used in next step, a BOOTPARAM GETFILE
+request -- sent to the server that responded to the WHOAMI request --
+requesting the name and address of the machine that will serve the client's
+root directory, as well as the path of the client's root on that server.
 
 Finally, this information (if it comes in) is used to issue a REMOTE MOUNT
 request to the client's root filesystem server, asking for an NFS file
-handle corresponding to the root filesystem. If successful, the boot program
-starts reading from the remote root filesystem in search of the kernel which
-is then read into memory.
+handle corresponding to the root filesystem. If successful, the boot
+program starts reading from the remote root filesystem in search of the
+kernel which is then read into memory.
 
 Unpack `base{:--:}OSrev.tgz' and `etc{:--:}OSrev.tgz' on the server in the root directory
 for your target machine. If you elect to use a separately NFS-mounted
diff --git a/distrib/notes/mvme88k/prep b/distrib/notes/mvme88k/prep
index c91c2e7aff8..a96d75f99b7 100644
--- a/distrib/notes/mvme88k/prep
+++ b/distrib/notes/mvme88k/prep
@@ -1,18 +1,50 @@
-dnl	$OpenBSD: prep,v 1.2 2003/08/10 21:04:06 miod Exp $
+dnl	$OpenBSD: prep,v 1.3 2003/09/06 23:34:01 miod Exp $
 Before installing OpenBSD on your machine, you will want to check your
-machine's NVRAM settings.
+machine's NVRAM settings, from the BUG.
+
+The BUG provides a simple syntax reminder for every command, as well as
+description of the commands; if you need help, just use
+
+    187-Bug> HE
+
+for a command list, or
+
+    187-Bug> HE FOO
+
+for help on a specific command.
+
+If you are located in the diagnostics directory (with a prompt in -Diag>
+rather than -Bug>), be sure to revert to the normal Bug operating mode
+with the SD command:
+
+     187-Diag> SD
+     187-Bug>
 
 The defaults settings are usually suitable for OpenBSD; make sure the
 environment is configured in BUG mode. You can check and change this with
-the ENV command.
+the ENV command. Ideally, the first two items of the ENV data will be as
+follows:
+
+    187-Bug> ENV
+    Bug or System environment [B/S] = B? 
+    Field Service Menu Enable [Y/N] = N? 
+
+in order to boot directly into the BUG, without executing the complete
+selftest sequence. Do not forget, after changing the ENV parameters, to
+save the changes in NVRAM as suggested by the ENV command itself.
+
+If the board has a built-in ethernet controller, its address must be correct;
+the LSAD command allows the address to be edited.
 
-Be sure to use the SET command to set the date before trying to use the
-ethernet support in the 187-Bug.
+OpenBSD/MACHINE will not run correctly if the clock is stopped (power-saving
+mode). Be sure to check that it is running by setting the current date with
+the SET command.
 
-If you plan to boot from the network, make sure your ENV settings match
-the following setup:
+If you plan to permanently boot from the network, make sure your ENV settings
+match the following setup:
 
-Network Auto Boot Enable [Y/N]   = N? y
-Network Auto Boot at power-up only [Y/N] = Y? n
-Network Auto Boot Abort Delay    = 5? 2
-Network Auto Boot Configuration Parameters Pointer (NVRAM) = 00000000? fffc0080
+    Network Auto Boot Enable [Y/N]   = N? Y
+    Network Auto Boot at power-up only [Y/N] = Y? N
+    Network Auto Boot Abort Delay    = 5? 2 (or any value at your choice)
+    Network Auto Boot Configuration Parameters Pointer (NVRAM) =
+        00000000? FFFC0080