diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-05-26 00:34:51 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-05-26 00:34:51 +0000 |
| commit | 3bf0e232ac4bf715abb1beb387d1c3f05fb185b1 (patch) | |
| tree | 68f197c304db77eb75d118c341ea02a8f5e1500e /distrib/armv7/ramdisk | |
| parent | df1b04e5ebbd86edbf64973c34d70cbf07f3f6b2 (diff) | |
Use a fat16 partition starting at sector 2048/1MB everywhere to simplify
things. OMAP can still load the first u-boot stage (MLO) from the fs
and imx u-boot can load files off fat. The offset allows space for the
u-boot images placed at raw offsets on imx and sunxi.
discussed with kettenis
Diffstat (limited to 'distrib/armv7/ramdisk')
| -rw-r--r-- | distrib/armv7/ramdisk/install.md | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md index e3b54c29e5f..3f42f2f13ad 100644 --- a/distrib/armv7/ramdisk/install.md +++ b/distrib/armv7/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.31 2016/05/25 00:20:09 jsg Exp $ +# $OpenBSD: install.md,v 1.32 2016/05/26 00:34:50 jsg Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -60,9 +60,7 @@ SANESETS="bsd" DEFAULTSETS="bsd bsd.rd ${MDSETS}" NEWFSARGS_msdos="-F 16 -L boot" -NEWFSARGS_ext2fs="-v boot" MOUNT_ARGS_msdos="-o-l" -MOUNT_ARGS_ext2fs= md_installboot() { local _disk=$1 @@ -75,10 +73,6 @@ md_installboot() { NITROGEN=$(scan_dmesg '/^imx0 at mainbus0: \(Freescale i.MX6 SABRE Lite.*\)/s//NITROGEN/p') WANDBOARD=$(scan_dmesg '/^imx0 at mainbus0: \(Wandboard i.MX6.*\)/s//WANDBOARD/p') - if [[ ${MDPLAT} == "IMX" && ! -n $WANDBOARD ]]; then - mount_args=${MOUNT_ARGS_ext2fs} - fi - mount ${mount_args} /dev/${_disk}i /mnt/mnt # extracted on all machines, so make snap works. @@ -139,26 +133,12 @@ md_prep_fdisk() { local _disk=$1 _d local bootparttype="C" - local bootsectorstart="64" + local bootsectorstart="2048" local bootsectorsize="32768" - local bootsectorend + local bootsectorend=$(($bootsectorstart + $bootsectorsize)) local bootfstype="msdos" local newfs_args=${NEWFSARGS_msdos} - CUBOX=$(scan_dmesg '/^imx0 at mainbus0: \(SolidRun.*\)/s//CUBOX/p') - WANDBOARD=$(scan_dmesg '/^imx0 at mainbus0: \(Wandboard i.MX6.*\)/s//WANDBOARD/p') - - # imx needs an ext2fs filesystem - if [[ ${MDPLAT} == "IMX" && ! -n $WANDBOARD ]]; then - bootparttype="83" - bootfstype="ext2fs" - newfs_args=${NEWFSARGS_ext2fs} - fi - if [[ -n $CUBOX || -n $WANDBOARD ]]; then - bootsectorstart="2048" - fi - bootsectorend=$(($bootsectorstart + $bootsectorsize)) - while :; do _d=whole if disk_has $_disk mbr; then |