From 2f9ece5c7693ee501aa397fd4fc19d740d08469c Mon Sep 17 00:00:00 2001
From: Stefan Sperling <stsp@cvs.openbsd.org>
Date: Thu, 2 Mar 2017 15:31:16 +0000
Subject: Document some installation quirks for the EdgeRouter Lite in
 INSTALL.octeon: How to deal with USB sticks which are not detected during
 power up. How to enable both CPU cores (this also applies to other octeon SMP
 systems). ok pirofti@ visa@

---
 distrib/notes/octeon/install | 15 ++++++++++++---
 distrib/notes/octeon/prep    | 19 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'distrib')

diff --git a/distrib/notes/octeon/install b/distrib/notes/octeon/install
index ac98147b68a..052d8a65da3 100644
--- a/distrib/notes/octeon/install
+++ b/distrib/notes/octeon/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.13 2015/08/30 19:53:58 matthieu Exp $
+dnl	$OpenBSD: install,v 1.14 2017/03/02 15:31:15 stsp Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -71,9 +71,18 @@ by the installer.
 	Protected 1 sectors
 	#
 
-If you've installed onto USB replace the 'fatload' part with:
+If you have installed onto USB use the following bootcmd instead:
 
-	fatload usb 0 $loadaddr bsd
+  fatload usb 0 ${loadaddr} bsd; bootoctlinux rootdev=sd0
+
+On dual-core systems, the coremask parameter enables the secondary CPU:
+
+  fatload usb 0 ${loadaddr} bsd; bootoctlinux rootdev=sd0 coremask=0x3
+
+On the EdgeRouter Lite, bootcmd may also reset the USB controller for
+more reliable USB device detection:
+
+  usb reset; fatload usb 0 $loadaddr bsd; bootoctlinux rootdev=sd0 coremask=0x3
 
 OpenBSDCongratulations
 
diff --git a/distrib/notes/octeon/prep b/distrib/notes/octeon/prep
index fd88c41e5a0..46830581273 100644
--- a/distrib/notes/octeon/prep
+++ b/distrib/notes/octeon/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.5 2015/08/02 09:54:29 jasper Exp $
+dnl	$OpenBSD: prep,v 1.6 2017/03/02 15:31:15 stsp Exp $
 By default MACHINE systems are shipped with a Linux (or proprietary) system
 installated on the CompactFlash card or USB drive.
 
@@ -26,6 +26,19 @@ Booting from a CF card or USB:
 
   	dd if=miniroot{:--:}OSrev.fs of=/dev/rsd1c
 
+  On the EdgeRouter Lite, some USB storage devices are not detected
+  immediately after power on:
+
+    USB:   (port 0) scanning bus for devices... 
+          USB device not responding, giving up (status=0)
+    1 USB Devices found
+           scanning bus for storage devices...
+    No device found. Not initialized?
+
+  In such cases, manually resetting the usb controller may help:
+  
+    Octeon ubnt_e100# usb reset
+
   Now load the ramdisk kernel using either of the following commands depending
   on the medium used. For USB:
   
@@ -74,3 +87,7 @@ Booting the installation kernel
   arguments provided:
 
 	# bootoctlinux
+
+  On dual-core systems, boot with both CPU cores enabled:
+
+	# bootoctlinux rootdev=rd0 coremask=0x3
-- 
cgit v1.2.3