On Mon, Dec 17, 2018 at 11:22:40PM -0500, Chris McGee wrote:
> Hi:
>
> I would like to add some info for Edgerouter 6
> (and presumably ER4, and maybe also ER12?) to install64.octeon.
> The document is great but it won't get a new user booting on the new
> 4-core machines with MMC drives.
>
> I tried to make it as brief as possible while pointing the user in the right
> direction, so for example it mentions that you're going to need to drop
> bsd.mp into the msdos kernel loader partition but doesn't explain how
> to do that. Seemed to be the right level of detail for this document.
>
> Here is a diff with my additions. Diff is from
> /OpenBSD/6.4/INSTALL.octeon.
>
> me@box> diff INSTALL.octeon INSTALL.octeon.er6
> 690a691,692
> > For the EdgeRouter Lite:
> >
> 702a705,710
> > For the EdgeRouter 6, installing to the internal MMC drive:
> >
> > # setenv bootcmd 'fatload mmc 0 ${loadaddr} bsd;bootoctlinux
> > coremask=0xf rootdev=/dev/sd0'
> > # setenv bootdelay 5
> > # saveenv
> >
> 707c715
> < On multi-core systems, the numcores parameter enables the secondary CPUs.
> ---
> > On multi-core systems, the numcores parameter enables multiple cores.
> 708a717,719
> > Note that this boot command does not actually put a multiprocessor kernel in
> > place; you will also need to copy the bsd.mp kernel to the octeon MS-DOS
> > partition (disklabel i by default) on your boot drive for multicore support.
> 709a721
> > Example booting from USB on the Edgerouter Lite:
> 711a724,726
> > Example booting from USB on the EdgeRouter 6:
> > fatload usb 0 ${loadaddr} bsd; bootoctlinux rootdev=sd0 numcores=4
> >
> 716a732,736
> > If you installed from a USB stick to the MMC on an EdgeRouter 4/6/8:
> > The machine assigns sd0 to USB first if present, then to MMC if present.
> > If you leave the USB install stick in, the machine will try to boot it.
> > Removing the USB device will cause sd0 to be assigned to mmc0 next boot,
> > allowing the machine to boot your newly-installed OpenBSD drive.
Good points. However, I would like to keep the text general and avoid
listing machine specifics if possible. Does the patch below make the
text any clearer?
In principle, the installer could show an example bootoctlinux command
with the correct parameters for the system.
Future snapshots built after today should handle the copying of bsd.mp
automatically.
Index: notes/octeon/install
===================================================================
RCS file: src/distrib/notes/octeon/install,v
retrieving revision 1.16
diff -u -p -r1.16 install
--- notes/octeon/install 30 Nov 2017 15:25:37 -0000 1.16
+++ notes/octeon/install 18 Dec 2018 16:21:22 -0000
@@ -56,8 +56,8 @@ restore it later if needed:
${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.
+partition on the first CF card. The FAT partition has been created by the
+installer.
# setenv bootcmd 'fatload ide 0:1 ${loadaddr} bsd;bootoctlinux
rootdev=/dev/octcf0'
# setenv bootdelay 5
@@ -71,9 +71,19 @@ by the installer.
Protected 1 sectors
#
-If you have installed onto USB use the following bootcmd instead:
+If you have installed onto eMMC, SATA or USB, use the following
+bootcmd instead:
- fatload usb 0 ${loadaddr} bsd; bootoctlinux rootdev=sd0
+ fatload <bootdev> 0 ${loadaddr} bsd; bootoctlinux rootdev=sd0
+
+where you replace ``<bootdev>'' with ``mmc'', ``sata'' or ``usb''.
+
+For stable root disk selection, you can specify the disk
+by disklabel(8) UID (DUID):
+
+ fatload usb 0 ${loadaddr} bsd; bootoctlinux rootdev=<duid>
+
+where ``<duid>'' is the DUID of your root disk.
On multi-core systems, the numcores parameter enables the secondary CPUs.
Use the total number of cores on your system as the value of the parameter.
