Bring the sparc64 installation notes in better shape, and closer to

reality.
Thanks to jason@ for hints and feedback.

7 files changed, 295 insertions, 527 deletions

diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index 2e148a08b81..10df204a435 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -6,30 +6,28 @@ OpenBSDbsd
 
 OpenBSDrd
 
-		installboot	The OpenBSD/sparc64 boot loader installation
+		installboot	The OpenBSD/MACHINE boot loader installation
 				program
-		bootblk		The OpenBSD/sparc64 boot block
-		ofwboot		The OpenBSD/sparc64 secondary boot loader
-		ofwboot.net	The OpenBSD/sparc64 network boot loader
+		bootblk		The OpenBSD/MACHINE boot block
+		ofwboot		The OpenBSD/MACHINE secondary boot loader
+		ofwboot.net	The OpenBSD/MACHINE network boot loader
 
 
 Please note that there are multiple bootable images and kernels, intended
-to allow installing OpenBSD/sparc64 in a variety of situations without
+to allow installing OpenBSD/MACHINE in a variety of situations without
 requiring a pre-existing working operating system.
 
-The "miniroot{:--:}OSrev.fs" is a small bootable root filesystem that can be used
-for installation or upgrade where there is some means to copy the miniroot
-image into a swap or unused partition on the system, and also for diskless
-or net booting.  This can be convenient if you have a existing installation
-of OpenBSD, NetBSD, or Solaris and wish to test or upgrade the existing
-system to OpenBSD.
+dnl The "miniroot{:--:}OSrev.fs" is a small bootable root filesystem that can be used
+dnl for installation or upgrade where there is some means to copy the miniroot
+dnl image into a swap or unused partition on the system, and also for diskless
+dnl or net booting.  This can be convenient if you have a existing installation
+dnl of OpenBSD, NetBSD, or Solaris and wish to test or upgrade the existing
+dnl system to OpenBSD.
 
 These bootable images are also useful as "failsafe" boots for system
 maintenance and disaster recovery.
 
 The kernel and boot images are provided for net booting installations.
-While the OpenBSD bootblocks will work with the provided miniroot images,
-Sun bootblocks require a separate kernel image and root filesystem.
 
 
 Bootable installation images:
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index b142f0e3697..1bd12b85e7d 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,17 +1,23 @@
-OpenBSD/sparc64 OSREV runs on the following classes of machines:
+OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- SBUS based workstations:
 		Ultra 1
+		Ultra 2 (should work, but could not be tested)
 	- PCI based workstations:
 		Ultra 5
+		Ultra 10
 	- faithful clones of the above Sun systems.
 
-OpenBSD/sparc64 OSREV does NOT run on these machines (yet):
-	- Sun Blade 100
+OpenBSD/MACHINE OSREV does NOT run on these machines (yet):
+	- Sun Blade 100 (onboard ethernet has issues)
+	- Ultra 30 (onboard scsi has issues)
+	- other, unlisted, UltraSPARC machines.
 
-The minimal configuration requires 32M of RAM and ~120M of disk space.
+The minimal configuration requires 32M of RAM and ~160M of disk space.
 To install the entire system requires much more disk space, and to run
 X or compile the system, more RAM is recommended.
 
+At the moment, the X window system is not available.
+
 Supported devices {:-include-:}:
 	serial ports: 
 		Zilog ttya and ttyb (can be used as console if needed),
@@ -27,6 +33,9 @@ Supported devices {:-include-:}:
 		on-board "esp" SCSI controller
 		SBus "esp" SCSI controller (including 3rd party compatibles), 
 
+	framebuffers:
+		on-board framebuffer, as text console only
+
 Hardware the we do NOT currently support, but get many questions about:
 	Multiprocessor machines
 	Audio drivers
@@ -35,4 +44,4 @@ Hardware the we do NOT currently support, but get many questions about:
         SBus GS framebuffer (aka cgtwelve)
         SBus GT framebuffer ("Graphics Tower")
         SBus ZX framebuffer (aka Leo)
-
+	other PCI and SBus cards have not been tested yet.
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index e741c90a244..fc230754c67 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,19 +1,23 @@
 OpenBSDInstallPrelude
 
-There are several ways to install OpenBSD onto a disk. The easiest way
-in terms of preliminary setup is to use the OpenBSD miniroot that can
-be booted off your local disk's swap partition.   The normal way is to
-use the OpenBSD installation floppy, or an installation tape.
-
-If your Sparc is hooked up in a network and you can find a server to
-arrange for a diskless setup, which is a convenient way to install on a
-machine whose disk does not currently hold a usable operating system.
+dnl XXX uncomment and alter once there is floppy, cdrom or miniroot
+dnl XXX available.
+dnl There are several ways to install OpenBSD onto a disk. The easiest way
+dnl in terms of preliminary setup is to use the OpenBSD miniroot that can
+dnl be booted off your local disk's swap partition.   The normal way is to
+dnl use the OpenBSD installation floppy.
+dnl
+dnl If your Sparc is hooked up in a network and you can find a server to
+dnl arrange for a diskless setup, which is a convenient way to install on a
+dnl machine whose disk does not currently hold a usable operating system.
+dnl This is difficult to get set up correctly the first time, but easy to
+dnl use afterwards.  (see ``Installing using a diskless setup'' below).
+Currently, the only way to install OpenBSD/MACHINE is to use a 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).
 
-It is also possible to install OpenBSD "manually" from a running SunOS
-system, using SunOS tools and gnu tar and gunzip (see ``Installing from
-SunOS'' below).
 
 
 Booting from the Installation Media:
@@ -24,7 +28,7 @@ does not necessarily wipe out all the partitions on the hard disk, errors
 during the install process can have unforeseen consequences and you will
 probably render the system unbootable if you start, but do not complete
 the installation.  Having the installation media for the prior installation,
-be it a SunOS or OpenBSD CD-ROM or OpenBSD install diskettes is good
+be it a Solaris or OpenBSD CD-ROM or OpenBSD install diskettes is good
 insurance if you want to be able to "go back" for some reason.
 
 After taking care of all that, bring your system down gracefully using
@@ -33,125 +37,62 @@ prompt.  Sun PROM monitor commands and setup differ considerably depending
 on the system architecture and age, you may needed to reference the PROM
 monitor manual for your system for details.
 
-There are four main cases:
-
-	sun4 (older servers, deskside workstations):
-		prompt is a ">", boot command is "b", uses sd(c,s,p) syntax
-		with s defined as scsi-unit*8+lun in hex
-	OpenBoot Version 1 (newer servers, desktop workstations):
-		prompt is "ok", boot command is "boot" uses sd(c,s,p) syntax
-		with s defined as scsi-unit.
-	OpenBoot Version 2 (newer servers, desktop workstations):
-		prompt is "ok", boot command is "boot" uses diskn:p syntax.
-        OpenBoot Version 2 (certain newer desktop workstations):
-		prompt is "ok", boot command is "boot" uses diskn syntax 
-		unless booting from a non-standard partition, in which case:
-		boot /sbus/esp/sd@t,0:p bsd  (where "t" is the scsi target, 
-		and "p" is the partition.  examples would be t="3" and p="b")
-
-	
-If you expect your workstation to have an OpenBoot Prom but get a ">", 
-enter then "n" command to enter the "new command mode".  You can set this
-as the default by doing a "setenv sunmon-compat? false" command, followed
-by a "reset" command.
-
-Note that OpenBoot Proms also do the Sun SCSI-ID shuffle for disks, this
-is described elsewhere in some detail.  For the purposes of this section,
-drive 0 refers to the internal or first SCSI drive, which usually has a
-SCSI-ID of 3.
-
- 
-Booting from Floppy Disk installation media:
- 
-        ok boot fd()bsd         # for version 1 OpenBOOT ROMs
-        ok boot floppy bsd      # for version 2 OpenBOOT ROMs
-
-This will cause the kernel contained in the floppy to be booted.
-
-After the initial device probe messages you'll asked to start the
-install or upgrade procedure. Proceed to the section ``Running the
-installation scripts'' below.
-
-
-Booting From CD-ROM installation media:
-
-	> b sd(,30,0)OSREV/sparc/bsd.rd		# for Sun4 monitors*
-						# (not working currently)
-	ok boot sd(,6,0)OSREV/sparc/bsd.rd	# for version 1 OpenBOOT ROMs
-	ok boot cdrom OSREV/sparc/bsd.rd	# for version 2 OpenBOOT ROMs
-
-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
-activity, but no messages or complaints about magic numbers,
-checksums or formats.
-
-Not all sparc systems support bootable CDROMS and the current
-boot image is only known to work on sun4c and sun4m architectures.
-If it does not work, you'll have to create a boot floppy or bootable
-hard disk using the instructions under preparing boot media.
-
-After the initial device probe messages you'll asked to start the
-install or upgrade procedure. Proceed to the section ``Running the
-installation scripts'' below.
-
-
-Booting from SCSI disk (miniroot or floppy image):
-
-Boot the miniroot by typing the appropriate command at the PROM:
-
-	> b sd(,,1)bsd 			# for sun4 monitors*
-	ok boot sd(,,1)bsd 		# for version 1 OpenBOOT ROMs
-	ok boot disk:b bsd 		# for version 2 OpenBOOT ROMs
-	ok boot /sbus/esp/sd@3,0:b bsd  # for version 2 OpenBOOT ROMs 
-					# that won't take disk:p syntax.
-
-If you've loaded the miniroot onto some other disk than the default
-drive 0, modify the boot specifier accordingly, keeping in mind the
-drive vs. scsi-id shuffling and partition a=0, b=1... 
-
-        > b sd(0,10,1)bsd       # example - scsi target 2 on sun4 monitors*
-	ok boot sd(0,3,1)bsd	# example - scsi target 0 on v1 OpenBOOT ROM
-	ok boot disk3:b bsd     # example - scsi target 0 on v2 OpenBOOT ROM
-	ok boot /sbus/esp/sd@0,0:b bsd  # example - scsi target 0 on v2  
-					# OpenBOOT ROM that won't take 
-					# disk:p syntax.
-
-(*) for sun4 this is scsi-target*8+scsi-lun (usually 0) expressed in hex...
-
-This will cause the kernel contained in the miniroot to be booted.
-After the initial device probe messages you'll asked to start the
-install or upgrade procedure. Proceed to the section ``Running the
-installation scripts'' below.
-
-
-Booting from SCSI tape:
-
-Boot the miniroot by typing the appropriate command at the PROM:
-
-	> b st(,,1)			# for sun4 monitors
-					# (not working currently)
-	ok boot st(,,1)			# for version 1 OpenBOOT ROMs
-	ok boot tape:1			# for version 2 OpenBOOT ROMs
-	ok boot /sbus/esp/st@4,0:1	# for version 2 OpenBOOT ROMs
-					# that won't take tape:n syntax.
-	
-The above instructions assume your tape drive is the default tape drive
-using SCSI id 4. If your drive uses id 5, modify the boot command
-accordingly:
-
-	> b st(,28,1)		# example - 2nd tape drive on sun4 monitors
-	ok boot st(,5,1)	# example - 2nd tape drive on v1 OpenBOOT ROM
-	ok boot tape1:1		# example - 2nd tape drive on v2 OpenBOOT ROM
-	ok boot /sbus/esp/st@5,0:1	# example - 2nd tape drive on v2
-					# OpenBOOT ROM that won't take
-					# tape:n syntax
-	
-This will cause the kernel contained in the miniroot to be booted.
-After the initial device probe messages you'll be asked to start the
-install or upgrade procedure. Proceed to the section ``Running the
-installation scripts'' below.
-
+dnl XXX to check
+dnl Note that OpenBoot Proms also do the Sun SCSI-ID shuffle for disks, this
+dnl is described elsewhere in some detail.  For the purposes of this section,
+dnl drive 0 refers to the internal or first SCSI drive, which usually has a
+dnl SCSI-ID of 3.
+dnl
+dnl 
+dnl XXX no floppy available yet
+dnl Booting from Floppy Disk installation media:
+dnl
+dnl        ok boot floppy bsd
+dnl
+dnl This will cause the kernel contained in the floppy to be booted.
+dnl
+dnl After the initial device probe messages you'll asked to start the
+dnl install or upgrade procedure. Proceed to the section ``Running the
+dnl installation scripts'' below.
+dnl 
+dnl
+dnl
+dnl XXX no cdrom release yet
+dnl Booting From CD-ROM installation media:
+dnl 
+dnl	ok boot cdrom OSREV/MACHINE/bsd.rd
+dnl
+dnl If the boot is successful, you will get a loader version message,
+dnl executable sizes and then the Kernel copyright and device probe
+dnl messages.  Boot failure modes are typically a lot of CD-ROM drive
+dnl activity, but no messages or complaints about magic numbers,
+dnl checksums or formats.
+dnl
+dnl After the initial device probe messages you'll asked to start the
+dnl install or upgrade procedure. Proceed to the section ``Running the
+dnl installation scripts'' below.
+dnl
+dnl
+dnl
+dnl XXX no miniroot filesystem yet
+dnl Booting from disk (miniroot or floppy image):
+dnl
+dnl Boot the miniroot by typing the appropriate command at the PROM:
+dnl
+dnl	ok boot disk:b bsd
+dnl
+dnl If you've loaded the miniroot onto some other disk than the default
+dnl drive 0, modify the boot specifier accordingly, keeping in mind the
+dnl drive vs. scsi-id shuffling and partition a=0, b=1... 
+dnl
+dnl	ok boot disk1:b bsd     # example - scsi target 1 or
+dnl				# second ide drive
+dnl
+dnl This will cause the kernel contained in the miniroot to be booted.
+dnl After the initial device probe messages you'll asked to start the
+dnl install or upgrade procedure. Proceed to the section ``Running the
+dnl installation scripts'' below.
+dnl
 
 Installing using a diskless setup:
 
@@ -164,12 +105,9 @@ the Sun System/Networks administrators guide constitute a good start).
 
 
 Boot your workstation from the server by entering the appropriate `boot'
-command at the monitor prompt. Depending on the PROM version in your machine,
-this command takes one of the following forms:
+command at the monitor prompt:
 
-	> b le()bsd.rd		# for sun4 monitors
-	ok boot le()bsd.rd	# for version 1 OpenBOOT ROMs
-	ok boot net bsd.rd	# for version 2 OpenBOOT ROMs
+	ok boot net bsd.rd
 
 This will cause the kernel provided by the diskless setup to be booted.
 After the initial probe messages you'll asked to start the install
@@ -177,7 +115,9 @@ or upgrade procedure. Proceed to the section ``Running the installation
 scripts'' below.
 
 
-Installing using the Floppy, CD-ROM, tape, miniroot or netboot procedure:
+dnl XXX Update title when installation media becomes available.
+dnl Installing using the Floppy, CD-ROM, miniroot or netboot procedure:
+Installing using the netboot procedure:
 
 OpenBSDInstallPart2
 
@@ -193,12 +133,8 @@ OpenBSDInstallPart2
 OpenBSDBootMsgs
 
 	While booting, you will probably see several warnings.  You
-	may be warned that the kernel can't figure out what device
-	it booted from and that no swap space is present.  Do not be
-	alarmed, these are completely normal.  The first warning
-	occurs because while OpenBSD/sparc can boot from the floppy
-	drive, the kernel itself lacks a floppy driver for some
-        architectures.
+	may be warned that no swap space is present. Do not be
+	alarmed, these are completely normal.
 
 	Next there will be a prompt asking you for a shell name, just
 	hit return to start executing the installation setup script.
@@ -261,17 +197,8 @@ OpenBSDBootMsgs
 	Next the system will give you a list of network interfaces you can
 	configure.  For each network interface you select to configure, it
 	will ask for the IP address to use, the symbolic host name to use,
-	the netmask to use and any media flags to set.  This is driver
-	dependent, but for the sparc le(4) driver, the flags usually carry
-	meaning:
-
-		auto		Use existing setting (only setup by netboot)
-		10baseT		Use UTP (twisted pair) port
-		10base5 	Use AUI port
-
-*** IMPORTANT - these are the correct setting for Sparc ethernet cards,
-		the suggestions shown by the install script are generic
-		and may or may not be correct...
+	the netmask to use and any media flags to set. It is usually safe
+	to keep the default settings.
 
 	After all network interfaces have been configured the install pro-
 	gram will ask for a default route and IP address of the primary
@@ -285,7 +212,7 @@ OpenBSDBootMsgs
 
 	After these preparatory steps has been completed, you will be
 	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
+	are several install methods supported; FTP, HTTP, CD-ROM, NFS
 	or a local disk partition.  To install from a tape, the distrib-
 	ution sets must have been written to tape prior to running the
 	installation program, either as tar images or as gzipped tar
@@ -321,17 +248,8 @@ The Sun monitor normally tries to load a file called "vmunix".
 On OpenBOOT ROM systems you can change it to load OpenBSD instead using
 the following commands:
 
-On version 1 OpenBOOT ROMs:
-    >n
-    ok setenv boot-from sd(0,0,0)bsd
-    ok
-
-On version 2 OpenBOOT ROMs:
     ok setenv boot-file bsd
-    ok setenv boot-device /sbus/esp/sd@0,0
 
-On sun4 systems, you may not need to specify the boot file, as 
-the OpenBSD boot blocks will look for "bsd" on the boot device by default.
 
 OpenBSDCongratulations
 
@@ -342,14 +260,7 @@ when running from a serial console, you may wish to adjust the eeprom
 settings for input-device, output-device, screen-#columns, and screen-#rows
 as appropriate.  
 
-If you plan on using the extra serial ports on 4/300 systems, 
-you'll need to make sure you have device nodes for them e.g.:
-  mknod /dev/ttyc c 12 4
-  mknod /dev/ttyd c 12 5
-To use these ports for terminals etc, you will want to add them to
-/etc/ttys.
-
-In order to use 'tip' on OpenBSD/sparc, you'll need to edit /etc/ttys
+In order to use 'tip' on OpenBSD/MACHINE, you'll need to edit /etc/ttys
 and add "local" to the end of the tty configuration line, and run 
 'ttyflags -a' to put your changes into effect.
 
@@ -358,100 +269,9 @@ it's recommended that you buy a book that discusses it.
 
 
 
-Installing from SunOS.
-
-You need a SunOS machine to install OpenBSD.  You also need at
-least the following pieces:
-
-    the *.tgz files you want to install (as a minimum, base{:--:}OSrev.tgz and
-       etc{:--:}OSrev.tgz)
-    gunzip (GNU gzip) SunOS binary
-    gtar (GNU tar) SunOS binary
-    a "/boot" file from a SunOS machine that matches your machine type
-	(e.g. sun or sun4c)
-    a kernel, most likely "/bsd"
-
-All these pieces, except "/boot" and the GNU utilities are supplied in
-the OpenBSD/sparc distribution.
-
-You need to format and partition the disk using SunOS (since
-OpenBSD/sparc uses SunOS disk labels.)  Give yourself adequate
-partition sizes.  Here is an example layout:
-
-    partition    size   offset	  will be..
-    sd0a        80000        0	  /
-    sd0b       256000    80000	  swap
-    sd0c      4165271        0	  `whole disk'
-    sd0d       100000   436000    /var
-    sd0f       100000   336000    /tmp
-    sd0g      3229271   936000    /usr
-    sd0h       400000   536000    /var/tmp
-
-Use SunOS to newfs the partitions which will have filesystems on them.
-(OpenBSD's filesystem format is identical to SunOS).
-
-    sunos# newfs /dev/rsd0a
-    [... lots of output]
- 
-Repeat for any other partition (in this example, /dev/rsd0d, /dev/rsd0f,
-/dev/rsd0g, /dev/rsd0h).
-
-NOTE: If you are able to, there is a performance benefit from
-newfs'ing using OpenBSD.  If you newfs using the OpenBSD newfs command,
-be sure to use the -O flag for your / partition, so that newfs will
-use the 4.3BSD filesystem format, rather than the new 4.4BSD filesystem
-format.  If you forget, you will not be able to boot -- the SunOS boot
-blocks do not understand the extended 4.4BSD filesystem format.
-
-Mount those partitions in a tree formation, under /mnt; ie:
-
-    sunos# df
-    Filesystem            kbytes    used   avail capacity  Mounted on
-    [...]
-    /dev/sd0a              38427       0   38427     0%    /mnt
-    /dev/sd0d              48249       0   48249     0%    /mnt/var
-    /dev/sd0f              48249       0   48249     0%    /mnt/tmp
-    /dev/sd0g            1564024       0 1564024     0%    /mnt/usr
-    /dev/sd0h             193536       0  193536     0%    /mnt/var/tmp
-
-Place a standard SunOS "boot" program in /mnt (your new root
-partition), and use the SunOS command "installboot" to make it work.
-The installboot man page says to do something like this:
-
-    sunos# cp /usr/mdec/sdboot /mnt/boot
-    sunos# sync; sync
-    sunos# /usr/mdec/installboot -vlt /mnt/boot /usr/mdec/bootsd /dev/rsd2a
-
-You can now extract the provided "*.tgz files onto your disk.
-
-    sunos# ls -FC
-    base{:--:}OSrev.tgz   comp{:--:}OSrev.tgz   man{:--:}OSrev.tgz       xfont{:--:}OSrev.tgz
-    bsd             etc{:--:}OSrev.tgz    misc{:--:}OSrev.tgz      xserv{:--:}OSrev.tgz
-    bsd.scsi3       game{:--:}OSrev.tgz   xbase{:--:}OSrev.tgz
-    sunos{:-#-:} gunzip < base{:--:}OSrev.tgz | (cd /mnt; gtar xvpf -)
-    [...] for each set
-
-And finally copy an OpenBSD kernel (either bsd or bsd.scsi3) onto your disk.
-
-    sunos# cp bsd.scsi3 /mnt/bsd
-
-The GNU gunzip and gtar programs are not distributed as part of SunOS,
-but may be present in your /usr/local/bin.  If not, you will need to
-obtain them from a GNU archive and install before proceeding.  The
-OpenBSD tar files are in the "new format" that includes directory
-information, and the standard SunOS tar will not extract from them
-successfully.
-
-After the files have been extracted, setup /mnt/etc/fstab to match
-your actual disk layout.  (Minus the "/mnt" component of each path, of
-course :-)
-
-Now proceed to reboot the machine and the customize your installation.
-
-
 Net Boot or Diskless Setup Information:
 
-The set up is similar to SunOS diskless setup, but not identical, because
+The set up is similar to the diskless setup, but not identical, because
 the Sun setup assumes that the bootblocks load a kernel image, which then
 uses NFS to access the exported root partition, while the OpenBSD bootblocks
 use internal NFS routines to load the kernel image directly from the
@@ -463,35 +283,17 @@ 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 Sparcstation expects to be able to download a second stage bootstrap
+Your UltraSPARC 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 sun4c machine which has been assigned IP
-address 130.115.144.11, will make an TFTP request for `8273900B.SUN4C'.
+the machine's IP address. For example, a machine which has been assigned IP
+address 130.115.144.11, will make an TFTP request for `8273900B'.
 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/boot' in the OpenBSD/sparc
-distribution. Unfortunately, it is necessary to install this file
-differently for sun4 and sun4c clients: the sun4 version needs to have its
-`a.out' header stripped off (otherwise the machine will crash), while the
-sun4c version must retain it (otherwise the PROM will complain).
-
-Here's an example to illustrate this whole mess:
-
-    server# cd /<client-root-dir>/usr/mdec
-    if client is a sun4:
-	server# set SKIP=1
-	server# set KARCH=SUN4
-    else
-	server# set SKIP=0
-	server# set KARCH=SUN4C
-    server# dd if=boot of=/tftpboot/boot.sparc.OpenBSD.$KARCH skip=$SKIP bs=32
-    server# cd /tftpboot
-    server# ln -s boot.sparc.OpenBSD.$KARCH 8273900B.$KARCH
-
+You can find the boot program in `/usr/mdec/boot' in the OpenBSD/MACHINE
+distribution.
 
 After the boot program has been loaded into memory and given control by
 the PROM, it starts locating the machine's remote root directory through
@@ -536,15 +338,15 @@ A few configuration files need to be edited:
 		Enter the entries for the remotely mounted filesystems.
 		For example:
 			server:/export/root/client       /     nfs  rw 0 0
-			server:/export/exec/sun4.OpenBSD /usr  nfs  rw 0 0
+			server:/export/exec/MACHINE.OpenBSD /usr  nfs  rw 0 0
 
 Now you must populate the the `/dev' directory for your client. If you server
 runs SunOS 4.x, you can simply change your working directory to `<root>/dev'
 and run the MAKEDEV script: `sh MAKEDEV all'.
 
-On SunOS 5.x systems, MAKEDEV can also be used, but there'll be error
-messages about unknown user and groups. These errors are inconsequential
-for the purpose of installing OpenBSD. However, you may want to correct them
-if you plan to the diskless setup regularly. In that case, you may re-run
-MAKEDEV on your OpenBSD machine once it has booted.
+On Solaris (SunOS 5.x) systems, MAKEDEV can also be used, but there'll be
+error messages about unknown user and groups. These errors are
+inconsequential for the purpose of installing OpenBSD. However, you may
+want to correct them if you plan to the diskless setup regularly. In that
+case, you may re-run MAKEDEV on your OpenBSD machine once it has booted.
 
diff --git a/distrib/notes/sparc64/prep b/distrib/notes/sparc64/prep
index 960d707b80e..3b5476d385e 100644
--- a/distrib/notes/sparc64/prep
+++ b/distrib/notes/sparc64/prep
@@ -1,7 +1,7 @@
 
+dnl XXX is security-mode still present?
 Your OpenBOOT ROM may need some setup.  You cannot use the security modes
-of the sparc OpenBOOT ROM.  Make sure that the ROM security modes are
-disabled:
+of the OpenBOOT ROM.  Make sure that the ROM security modes are disabled:
 
     ok setenv security-mode none
 
@@ -13,8 +13,8 @@ both OpenBSD and Solaris environments on the same system.
 
     If the OpenBSD fsck(8) utility is used on a Solaris filesystem, it will
     set OpenBSD "clean flags" and BSD4.4 summary fields in the superblock.
-    SunOS does *not* like this and you will have to do a "fsck -b 32" under
-    SunOS to access an alternate superblock to repair the filesystem.  You
+    Solaris does *not* like this and you will have to do a "fsck -b 32" under
+    Solaris to access an alternate superblock to repair the filesystem.  You
     should always specify Solaris filesystem with a "pass number" of 0 in
     their /etc/fstab entry to prevent this, and preferably mount them "RO".
 
@@ -29,7 +29,7 @@ both OpenBSD and Solaris environments on the same system.
     enabled.
 
 The OpenBSD "Sun Compatible" disklabel have been extended to support 16
-partitions, which may be compatible with Solaris, but the old Solaris
+partitions, which may be compatible with Solaris, but the Solaris
 format(8) utility only sees the first 8 partitions and may "lose"
 information about the extended partitions.
 
diff --git a/distrib/notes/sparc64/upgrade b/distrib/notes/sparc64/upgrade
index b7ee9ee41a7..906a3abbc56 100644
--- a/distrib/notes/sparc64/upgrade
+++ b/distrib/notes/sparc64/upgrade
@@ -1 +1,8 @@
-OpenBSDUpgrade({:- or the installation floppy-:})
+Since OpenBSD OSREV is the first release for MACHINE systems, upgrades
+are not expected.
+If you have been using an old OpenBSD/MACHINE snapshot, you can follow the
+follwing instructions.
+
+dnl XXX replace when floppy disk available
+dnl OpenBSDUpgrade({:- or the installation floppy-:})
+OpenBSDUpgrade
diff --git a/distrib/notes/sparc64/whatis b/distrib/notes/sparc64/whatis
index a8bc9cd4615..3bcc22f52c1 100644
--- a/distrib/notes/sparc64/whatis
+++ b/distrib/notes/sparc64/whatis
@@ -1,4 +1,4 @@
-OpenBSD/sparc64 OSREV is a port to the UltraSPARC processor-based machines,
+OpenBSD/MACHINE OSREV is a port to the UltraSPARC processor-based machines,
 such as the workstations manufactured by Sun Microsystems.
 
 This port is in its infancy, so device support is somewhat limited, but
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index f023c0c2ffb..f62dd83c2a0 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -9,171 +9,173 @@ Installation is supported from several media types, including:
 Not all methods are supported on all Sparc Systems and some of them
 work only with the floppy or the miniroot installation.
 
-If you have the OpenBSD CD-ROM distribution (and a CD-ROM drive), you
-may be able boot from it.  Not all sparc systems support booting from
-CD-ROM and the current boot images is only known to work on sun4c and
-some sun4m architecture workstations.  If you can boot from the CD-ROM,
-you are home free and can proceed to the installation steps.  If not,
-you will need to do some setup work to prepare a bootable image, either
-a floppy, hard drive, or compatible net boot server.
-
+dnl XXX uncomment when cd-rom distribution available
+dnl If you have the OpenBSD CD-ROM distribution (and a CD-ROM drive), you
+dnl may be able boot from it. If you can boot from the CD-ROM,
+dnl you are home free and can proceed to the installation steps.  If not,
+dnl you will need to do some setup work to prepare a bootable image, either
+dnl a floppy, hard drive, or compatible net boot server.
+dnl 
 In addition to the bootable image, you also need to consider how to
-access the binary distribution sets to actually install the system.  If
-you have the OpenBSD CD-ROM distribution you can either access the
-CD-ROM directly from the bootable image or remotely mounted on another
-system via NFS.
-
-Although you can access the distribution sets directly from the CD-ROM or
-from one of the FTP mirrors over the internet, you may wish to transfer
-the sets to a local FTP or NFS server, or copy them to a partition on
-the target system's disk or onto a SCSI tape.
+access the binary distribution sets to actually install the system.
+dnl XXX uncomment when cd-rom distribution available
+dnl If you have the OpenBSD CD-ROM distribution you can either access the
+dnl CD-ROM directly from the bootable image or remotely mounted on another
+dnl system via NFS.
+dnl
+dnl Although you can access the distribution sets directly from the CD-ROM or
+dnl from one of the FTP mirrors over the internet, you may wish to transfer
+dnl the sets to a local FTP or NFS server, or copy them to a partition on
+dnl the target system's disk.
 
 The variety of options listed may seem confusing, but situations vary
 widely in terms of what peripherals and what sort of network arrangements
 a user has, the intent is to provide some way that will be practical.
 
-
-Creating a bootable floppy disk using DOS/Windows:
-
-	First you need to get access to the OpenBSD Bootable floppy
-	images.  If you can access the CD-ROM distribution under DOS
-	the bootable disks are in the OSREV/sparc directory, otherwise
-	you you will have to download them from one of the OpenBSD
-	ftp or http mirror sites, using ftp or a web-viewer.  In either
-	case, take care to do "binary" transfers, since these are
-	images files and any DOS cr/lf translations or control/z EOF
-	interpretations will result in corrupted transfers.
-	
-	You will also need to go to the "tools" directory and grab a
-	copy of the rawrite.exe utility and its documentation.  This
-	program is needed to correctly copy the bootable filesystem
-	image to the floppy, since it's an image of a unix partition
-	containing a ffs filesystem, not a MSDOS format diskette.
-
-	Once you have installed rawrite.exe, just run it and specify the
-	name of the bootable image, such as "floppy.fs" and the name of
-	the floppy drive, such as "a:".  Be sure to use good quality HD
-	(1.44MB) floppies, formatted on the system you're using.  The
-	image copy and boot process is not especially tolerant of read
-	errors. 
-
-	Note that if you are using NT to write the images to disk, you
-	will need to use ntrw.exe instead.  It is also available in the
-	"tools" directory.  Grab it and run in with the correct 
-	arguments like this "ntrw <image> <drive>:"
-
-	Note that, when installing, the boot floppy can be write-protected
-	(i.e.  read-only).
-
-
-Creating a bootable floppy disk using SunOS or other Un*x-like system:
-
-	First, you will need obtain a local copy of the bootable filesystem
-	image as described above.  If possible use cksum or md5 to verify
-	the checksums of the images vs. the values in the CKSUM or MD5
-	files on the mirror site.
-
-	Next, use the dd(1) utility to copy the file to the floppy drive.
-	Under SunOS, the command would be:
-
-		dd if=floppy{:--:}OSrev.fs of=/dev/rfd0c bs=36b
-
-	If you are using something other than SunOS, you may have to adapt
-	this to conform to local naming conventions for the floppy and
-	options suitable for copying to a "raw" floppy image.  The key
-	issue is that the device name used for the floppy *must* be one
-	that refers to the whole 2880 block image, not a partition or
-	compatibility mode, and the copy command needs to be compatible
-	with the requirement that writes to a raw device must be in
-	multiples of 512-byte blocks.  The variations are endless and
-	beyond the scope of this document.
-
-	If you're doing this on the system you intend to boot the floppy on,
-	copying the floppy back to a file and doing a compare or checksum
-	is a good way to verify that the floppy is readable and free of
-	read/write errors.
-
-
-
-Creating a bootable hard disk using SunOS or other Un*x-like system:
-
-	If you don't have a floppy drive you can copy the single floppy
-	installation image "floppy{:--:}OSrev.fs" or the mini-root "miniroot{:--:}OSrev.fs"
-	onto the hard disk you intend to boot on.  Traditionally, the
-	way to do this is to use dd(1) to place the bootable filesystem
-	image in the "swap" partition of the disk (while running in
-	single user mode), and then booting from that partition.
-
-	Using the "b" partition allows you to boot without overwriting
-	any useful parts of the disk, you can also use another partition,
-	but don't used the "a" or "c" partition without understanding
-	the disklabel issues described below under "incompatible systems".
-
-	This requires that you be running SunOS, Solaris, OpenBSD or NetBSD
-	which have a compatible view of SunOS disk labels and partitions.
-
-	Use the dd(1) utility to copy the file to the hard drive.
-	Under SunOS, the command would be:
-
-		dd if=floppy{:--:}OSrev.fs of=/dev/rsd0b bs=36b
-				- or -
-		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=36b
-
-	The blocksize is arbitrary as long as it's a multiple of 512-bytes
-	and within the maximum supported by the driver, i.e. bs=126b may
-	not work for all cases.  Again, device/partition names may vary,
-	depending on the OS involved.
-
-	If you are preparing the hard drive on an incompatible system or
-	don't care about the hard disk contents, you can also install the
-	bootable image starting at the beginning of the disk. This lets
-	you prepare a bootable hard-drive even if don't have a working
-	operating system on your Sparc, but it important to understand
-	that the bootable image installed this way includes a "disk label"
-	which can wipe out any pre-existing disklabels or partitioning for
-	the drive.
-
-	The floppy image is used only for booting, and can be placed in
-	a partition that will be overwritten during the install process,
-	since it actually runs off a ram-disk image in the kernel.  In
-	contrast the miniroot is a normal unix root filesystem and you
-	must place in a partition that will not be overwritten until you've
-	completed the installation process.
-
-	To copy the floppy image to the whole disk, overwriting labels:
-
-		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
-
-	Two notes - X should be replaced by the unit number of the target
-	disk, which is most likely *not* the disk/partition that's your
-	current root partition.  Again names may vary depending on the
-	OS involved.  Second, after doing this, the disklabel will be one
-	that would be appropriate for a floppy, i.e. one partition of 2880
-	block, and you'll probably want to change that later on.
-
-	If you're starting with a virgin disk and trying to do this under
-	SunOS, use format(8) and newfs(8) to set up the partitions and
-	mark the intended partition as an normal partition type.  If you're
-	using OpenBSD, perhaps on another architecture, OpenBSD will
-	create a "fictitious label" that will let you access the whole
-	disk.
-
-	To copy the floppy image to the hard disk, preserving SunOS,
-	Solaris NetBSD or OpenBSD labels:
-
-		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=1b skip=1 seek=1
-
-	You need to be sure that your version of dd(1) supports the
-	skip and seek operands, otherwise you can try a technique like:
-
-		dd if=/dev/rsdXc of=/tmp/label bs=1b count=1
-		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
-		dd if=/tmp/label of=/dev/rsdXc bs=1b count=1
-
-	In either case, you've created a situation where the disklabel
-	and the filesystem information don't agree about the partition
-	size and geometry, however the results will be usable.
-
+dnl
+dnl XXX no floppy available yet
+dnl Creating a bootable floppy disk using DOS/Windows:
+dnl
+dnl	First you need to get access to the OpenBSD Bootable floppy
+dnl	images.  If you can access the CD-ROM distribution under DOS
+dnl	the bootable disks are in the OSREV/MACHINE directory, otherwise
+dnl	you you will have to download them from one of the OpenBSD
+dnl	ftp or http mirror sites, using ftp or a web-viewer.  In either
+dnl	case, take care to do "binary" transfers, since these are
+dnl	images files and any DOS cr/lf translations or control/z EOF
+dnl	interpretations will result in corrupted transfers.
+dnl	
+dnl	You will also need to go to the "tools" directory and grab a
+dnl	copy of the rawrite.exe utility and its documentation.  This
+dnl	program is needed to correctly copy the bootable filesystem
+dnl	image to the floppy, since it's an image of a unix partition
+dnl	containing a ffs filesystem, not a MSDOS format diskette.
+dnl
+dnl	Once you have installed rawrite.exe, just run it and specify the
+dnl	name of the bootable image, such as "floppy.fs" and the name of
+dnl	the floppy drive, such as "a:".  Be sure to use good quality HD
+dnl	(1.44MB) floppies, formatted on the system you're using.  The
+dnl	image copy and boot process is not especially tolerant of read
+dnl	errors. 
+dnl
+dnl	Note that if you are using NT to write the images to disk, you
+dnl	will need to use ntrw.exe instead.  It is also available in the
+dnl	"tools" directory.  Grab it and run in with the correct 
+dnl	arguments like this "ntrw <image> <drive>:"
+dnl
+dnl	Note that, when installing, the boot floppy can be write-protected
+dnl	(i.e.  read-only).
+dnl
+dnl
+dnl Creating a bootable floppy disk using SunOS or other Un*x-like system:
+dnl
+dnl	First, you will need obtain a local copy of the bootable filesystem
+dnl	image as described above.  If possible use cksum or md5 to verify
+dnl	the checksums of the images vs. the values in the CKSUM or MD5
+dnl	files on the mirror site.
+dnl
+dnl	Next, use the dd(1) utility to copy the file to the floppy drive.
+dnl	Under SunOS, the command would be:
+dnl
+dnl		dd if=floppy{:--:}OSrev.fs of=/dev/rfd0c bs=36b
+dnl
+dnl	If you are using something other than SunOS, you may have to adapt
+dnl	this to conform to local naming conventions for the floppy and
+dnl	options suitable for copying to a "raw" floppy image.  The key
+dnl	issue is that the device name used for the floppy *must* be one
+dnl	that refers to the whole 2880 block image, not a partition or
+dnl	compatibility mode, and the copy command needs to be compatible
+dnl	with the requirement that writes to a raw device must be in
+dnl	multiples of 512-byte blocks.  The variations are endless and
+dnl	beyond the scope of this document.
+dnl
+dnl	If you're doing this on the system you intend to boot the floppy on,
+dnl	copying the floppy back to a file and doing a compare or checksum
+dnl	is a good way to verify that the floppy is readable and free of
+dnl	read/write errors.
+dnl
+dnl
+
+dnl XXX uncomment when miniroot available
+dnl Creating a bootable hard disk using SunOS or other Un*x-like system:
+dnl 
+dnl 	If you don't have a floppy drive you can copy the single floppy
+dnl 	installation image "floppy{:--:}OSrev.fs" or the mini-root "miniroot{:--:}OSrev.fs"
+dnl 	onto the hard disk you intend to boot on.  Traditionally, the
+dnl 	way to do this is to use dd(1) to place the bootable filesystem
+dnl 	image in the "swap" partition of the disk (while running in
+dnl 	single user mode), and then booting from that partition.
+dnl 
+dnl 	Using the "b" partition allows you to boot without overwriting
+dnl 	any useful parts of the disk, you can also use another partition,
+dnl 	but don't used the "a" or "c" partition without understanding
+dnl 	the disklabel issues described below under "incompatible systems".
+dnl 
+dnl 	This requires that you be running SunOS, Solaris, OpenBSD or NetBSD
+dnl 	which have a compatible view of SunOS disk labels and partitions.
+dnl 
+dnl 	Use the dd(1) utility to copy the file to the hard drive.
+dnl 	Under SunOS, the command would be:
+dnl 
+dnl 		dd if=floppy{:--:}OSrev.fs of=/dev/rsd0b bs=36b
+dnl 				- or -
+dnl 		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=36b
+dnl 
+dnl 	The blocksize is arbitrary as long as it's a multiple of 512-bytes
+dnl 	and within the maximum supported by the driver, i.e. bs=126b may
+dnl 	not work for all cases.  Again, device/partition names may vary,
+dnl 	depending on the OS involved.
+dnl 
+dnl 	If you are preparing the hard drive on an incompatible system or
+dnl 	don't care about the hard disk contents, you can also install the
+dnl 	bootable image starting at the beginning of the disk. This lets
+dnl 	you prepare a bootable hard-drive even if don't have a working
+dnl 	operating system on your Sparc, but it important to understand
+dnl 	that the bootable image installed this way includes a "disk label"
+dnl 	which can wipe out any pre-existing disklabels or partitioning for
+dnl 	the drive.
+dnl 
+dnl 	The floppy image is used only for booting, and can be placed in
+dnl 	a partition that will be overwritten during the install process,
+dnl 	since it actually runs off a ram-disk image in the kernel.  In
+dnl 	contrast the miniroot is a normal unix root filesystem and you
+dnl 	must place in a partition that will not be overwritten until you've
+dnl 	completed the installation process.
+dnl 
+dnl 	To copy the floppy image to the whole disk, overwriting labels:
+dnl 
+dnl 		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
+dnl 
+dnl 	Two notes - X should be replaced by the unit number of the target
+dnl 	disk, which is most likely *not* the disk/partition that's your
+dnl 	current root partition.  Again names may vary depending on the
+dnl 	OS involved.  Second, after doing this, the disklabel will be one
+dnl 	that would be appropriate for a floppy, i.e. one partition of 2880
+dnl 	block, and you'll probably want to change that later on.
+dnl 
+dnl 	If you're starting with a virgin disk and trying to do this under
+dnl 	SunOS, use format(8) and newfs(8) to set up the partitions and
+dnl 	mark the intended partition as an normal partition type.  If you're
+dnl 	using OpenBSD, perhaps on another architecture, OpenBSD will
+dnl 	create a "fictitious label" that will let you access the whole
+dnl 	disk.
+dnl 
+dnl 	To copy the floppy image to the hard disk, preserving SunOS,
+dnl 	Solaris NetBSD or OpenBSD labels:
+dnl 
+dnl 		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=1b skip=1 seek=1
+dnl 
+dnl 	You need to be sure that your version of dd(1) supports the
+dnl 	skip and seek operands, otherwise you can try a technique like:
+dnl 
+dnl 		dd if=/dev/rsdXc of=/tmp/label bs=1b count=1
+dnl 		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
+dnl 		dd if=/tmp/label of=/dev/rsdXc bs=1b count=1
+dnl 
+dnl 	In either case, you've created a situation where the disklabel
+dnl 	and the filesystem information don't agree about the partition
+dnl 	size and geometry, however the results will be usable.
+dnl 
 
 Creating a network bootable setup using SunOS or other Un*x-like system:
 
@@ -203,56 +205,6 @@ distribution sets to a local server or disk and perform the installation
 from there, rather than directly on the internet.
 
 
-To install or upgrade OpenBSD using a tape, you need to do the following:
-
-	To install OpenBSD from a tape, you need to make a tape that
-	contains the distribution set files, each in "tar" format or
-	in "gzipped tar format".  First you will need to transfer the
-	distribution sets to your local system, using ftp or by mounting
-	the CD-ROM containing the release.  Then you need to make a tape
-	containing the files.
-
-	If you're making the tape on a UN*X-like system, the easiest way
-	to do so is make a shell script along the following lines, call it
-	"/tmp/maketape".
-
-	#! /bin/sh
-	tape=/dev/nrst0
-	mt -f ${tape} rewind
-	if test $# -lt 1
-	then
-		for file in bsd.rd boot
-		do
-			dd if=${file} of=${tape} obs=8k conv=sync
-		done
-	fi
-	for file in base etc comp game man misc xbase xfont xserv xshare
-	do
-		dd if=${file}OSrev.tgz of=${tape} obs=8k conv=sync
-	done
-	tar cf ${tape} bsd
-	mt -f ${tape} offline
-	# end of script
-
-
-	And then:
-
-	cd .../OSREV/sparc
-	sh -x /tmp/maketape
-
-	
-	Note that this script creates a bootable tape. If you only want to
-	fetch the OpenBSD files from tape, but want to boot from another
-	device, you can save time and space creating the tape this way:
-
-	cd .../OSREV/sparc
-	sh -x /tmp/maketape noboot
-
-	
-	If you're using a system other than OpenBSD or SunOS, the tape
-	name and other requirements may change.
-
-
 To install OpenBSD using a remote partition, mounted via
 NFS, you must do the following: