long overdue overhaul to include instructions for miniroot and usb

3 files changed, 98 insertions, 84 deletions

diff --git a/distrib/notes/octeon/hardware b/distrib/notes/octeon/hardware
index 4b4b7ca27a5..15d05b1b48e 100644
--- a/distrib/notes/octeon/hardware
+++ b/distrib/notes/octeon/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.7 2015/06/09 19:29:57 jasper Exp $
+dnl	$OpenBSD: hardware,v 1.8 2015/08/02 09:54:29 jasper Exp $
 The following machines are targeted by OpenBSD/MACHINE:
 
 	Portwell CAM-0100
@@ -7,14 +7,9 @@ The following machines are targeted by OpenBSD/MACHINE:
 	  some effort.
 
 	Ubiquiti Networks EdgeRouter Lite / PoE
-	  onboard serial port and Ethernet are supported; it's possible
-	  to boot OpenBSD/MACHINE on this machine over NFS. There is no
-	  USB support yet, which means that there is no local storage
-	  (no onboard CompactFlash).
+	  onboard serial port, Ethernet and USB controller are supported.
 
 	D-Link DSR-500
-	  onboard serial port and Ethernet are supported; it's possible
-	  to boot OpenBSD/MACHINE on this machine over NFS. The onboard
-	  CompactFlash is not yet supported which, together with the
-	  lack of USB support, means that there is no local storage
-	  available at the moment for this model.
+	  onboard serial port, Ethernet and USB controller are supported;
+	  it's possible to boot OpenBSD/MACHINE on this machine over NFS.
+	  The onboard CompactFlash is not yet supported.
diff --git a/distrib/notes/octeon/install b/distrib/notes/octeon/install
index 8f4b2e3b7c2..23630f3b900 100644
--- a/distrib/notes/octeon/install
+++ b/distrib/notes/octeon/install
@@ -1,76 +1,6 @@
-dnl	$OpenBSD: install,v 1.11 2014/07/13 18:08:16 jasper Exp $
+dnl	$OpenBSD: install,v 1.12 2015/08/02 09:54:29 jasper Exp $
 OpenBSDInstallPrelude
 
-Booting the installation media:
-
-There are two ways to load an OpenBSD/MACHINE kernel (or ramdisk),
-over TFTP or from the internal CompactFlash storage.
-
-For TFTP you will first need to setup a TFTP server as described in
-diskless(8). Assuming tftpd(8) chroots into /tftpboot, copy bsd.rd into that
-directory.
-
-Power on your OpenBSD/MACHINE device and from the U-Boot prompt set up
-networking. In this example it is assumed you have a DHCP server in your
-network:
-
-	# dhcp
-
-If you don't have a DHCP server, you need to set the ipaddr U-Boot environment
-variable:
-
-	# setenv ipaddr <static ip address>
-
-Now set the IP address of your TFTP server:
-
-	# setenv serverip <server ip>
-
-The ramdisk kernel needs to be loaded into memory. If you use "0" as the
-address, the default address location will be used by U-Boot:
-
-	# tftpboot 0 bsd.rd
-	Using octeth0 device
-	TFTP from server 192.168.178.30; our IP address is 192.168.178.89
-	Filename 'bsd.rd'.
-	Load address: 0x9f00000
-	Loading: #########################
-	done
-	Bytes transferred = 7191474 (6dbbb2 hex), 8617 Kbytes/sec
-
-Now the kernel can be booted from the default memory location, with no
-arguments provided:
-
-	# bootoctlinux
-
-OpenBSD/MACHINE currently lacks a real bootloader. It is possible however to
-boot into bsd upon powering on the machine.
-
-From the U-Boot commandline, make a copy of the current ${bootcmd} so you can
-restore it later if needed:
-
-	# setenv old_bootcmd ${bootcmd}
-
-${bootcmd} is run by U-Boot when ${autoload} is enabled. Now create a new
-${bootcmd} which will load an ELF file called 'bsd' from the first active FAT
-partition on the first CF card (created by the installer) and save the
-environment to persistent storage:
-
-	# setenv bootcmd 'fatload ide 0:1 ${loadaddr} bsd;bootoctlinux rootdev=/dev/octcf0'
-	# setenv bootdelay 5
-	# saveenv
-	Saving Environment to Flash...
-	Un-Protected 1 sectors
-	Erasing Flash...
-	. done
-	Erased 1 sectors
-	Writing to Flash... .done
-	Protected 1 sectors
-	#
-
-Depending on your hardware you may need to replace 'ide' with 'usb'.
-
-No miniroot is provided at this time.
-
 OpenBSDInstallPart2
 
 OpenBSDInstallPart3(,"octcf0 for internal CompactFlash storage.")
@@ -116,10 +46,35 @@ OpenBSDCommonInstall
 
 OpenBSDInstallWrapup
 
-dnl CAM-0100 systems final steps:
+OpenBSD/MACHINE currently lacks a real bootloader. It is possible however to
+boot into OpenBSD upon powering on the machine.
 
-OpenBSDCongratulations
+From the U-Boot commandline, make a copy of the current ${bootcmd} so you can
+restore it later if needed:
+
+	# setenv old_bootcmd ${bootcmd}
+
+${bootcmd} is run by U-Boot when ${autoload} is enabled. Now create a new
+${bootcmd} which will load an ELF file called 'bsd' from the first active FAT
+partition on the first CF card or USB device. The FAT partition has been created
+by the installer.
 
+	# setenv bootcmd 'fatload ide 0:1 ${loadaddr} bsd;bootoctlinux rootdev=/dev/octcf0'
+	# setenv bootdelay 5
+	# saveenv
+	Saving Environment to Flash...
+	Un-Protected 1 sectors
+	Erasing Flash...
+	. done
+	Erased 1 sectors
+	Writing to Flash... .done
+	Protected 1 sectors
+	#
 
+If you've installed onto USB replace the 'fatload' part with:
+
+	fatload usb 0 $loadaddr bsd
+
+OpenBSDCongratulations
 
 OpenBSDUnattendedInstallation
diff --git a/distrib/notes/octeon/prep b/distrib/notes/octeon/prep
index 59085bfb580..fd88c41e5a0 100644
--- a/distrib/notes/octeon/prep
+++ b/distrib/notes/octeon/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.4 2014/02/28 00:47:14 afresh1 Exp $
+dnl	$OpenBSD: prep,v 1.5 2015/08/02 09:54:29 jasper Exp $
 By default MACHINE systems are shipped with a Linux (or proprietary) system
 installated on the CompactFlash card or USB drive.
 
@@ -10,3 +10,67 @@ power to the device and start it.
 Unless you have removed or changed the Linux installation it will be booted
 automatically. If you are quick you can interrupt booting (while still in
 U-Boot) with ^C.
+
+There are several ways to load an OpenBSD/MACHINE kernel (or ramdisk),
+over TFTP, from the internal CompactFlash or USB storage.
+
+Booting from a CF card or USB:
+
+  To use the miniroot image you will need another machine to plug the
+  SD card in to. Any machine type will do, as long as it supports SD card
+  storage devices.  Under OpenBSD, it will appear as a ``sd'' device, for
+  example sd1.
+  
+  Use the dd(1) utility to copy the miniroot to the hard drive.
+  The command would likely be, under OpenBSD:
+
+  	dd if=miniroot{:--:}OSrev.fs of=/dev/rsd1c
+
+  Now load the ramdisk kernel using either of the following commands depending
+  on the medium used. For USB:
+  
+    Octeon ubnt_e100# fatload usb 0 $loadaddr bsd.rd
+  
+  For Compact Flash use:
+
+    # fatload ide 0:1 ${loadaddr} bsd.rd
+
+Booting over the network:
+
+  For TFTP you will first need to setup a TFTP server as described in
+  diskless(8). Assuming tftpd(8) chroots into /tftpboot, copy bsd.rd into that
+  directory.
+
+  Power on your OpenBSD/MACHINE device and from the U-Boot prompt set up
+  networking. In this example it is assumed you have a DHCP server in your
+  network:
+
+	# dhcp
+
+  If you don't have a DHCP server, you need to set the ipaddr U-Boot environment
+  variable:
+
+	# setenv ipaddr <static ip address>
+
+  Now set the IP address of your TFTP server:
+
+	# setenv serverip <server ip>
+
+  The ramdisk kernel needs to be loaded into memory. If you use "0" as the
+  address, the default address location will be used by U-Boot:
+
+	# tftpboot 0 bsd.rd
+	Using octeth0 device
+	TFTP from server 192.168.178.30; our IP address is 192.168.178.89
+	Filename 'bsd.rd'.
+	Load address: 0x9f00000
+	Loading: #########################
+	done
+	Bytes transferred = 7191474 (6dbbb2 hex), 8617 Kbytes/sec
+
+Booting the installation kernel
+
+  Now the kernel can be booted from the default memory location, with no
+  arguments provided:
+
+	# bootoctlinux