diff options
| author |   jsg <jsg@openbsd.org> | 2016-05-25 00:20:09 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2016-05-25 00:20:09 +0000 |
| commit | a1f0bfe1f3b0b0058dcb93d1268f7027b26bcc50 (patch) | |
| tree | 5ae7ba94e651d1eca7be38898742d0d20512191a | |
| parent | NUL-terminate argv when parsing options, following other (diff) | |
| download | wireguard-openbsd-a1f0bfe1f3b0b0058dcb93d1268f7027b26bcc50.tar.xz wireguard-openbsd-a1f0bfe1f3b0b0058dcb93d1268f7027b26bcc50.zip | |
Use efiboot when setting up the installed disk. If efiboot is placed
in the correct path on disk u-boot will load it and search for dtb
files without a script.
Leave sabre lite/nitrogen with the old method as boundary devices haven't
released u-boot 2015.05 yet.
ok kettenis@
| -rw-r--r-- | distrib/armv7/ramdisk/install.md | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md index 79f36980121..e3b54c29e5f 100644 --- a/distrib/armv7/ramdisk/install.md +++ b/distrib/armv7/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.30 2016/05/22 08:01:04 jsg Exp $ +# $OpenBSD: install.md,v 1.31 2016/05/25 00:20:09 jsg Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -81,26 +81,11 @@ md_installboot() { mount ${mount_args} /dev/${_disk}i /mnt/mnt - if [[ -f /mnt/bsd.${MDPLAT}.umg ]]; then - mv /mnt/bsd.${MDPLAT}.umg /mnt/mnt/bsd.umg - fi - if [[ -f /mnt/bsd.rd.${MDPLAT}.umg ]]; then - mv /mnt/bsd.rd.${MDPLAT}.umg /mnt/mnt/bsdrd.umg - fi - # extracted on all machines, so make snap works. tar -C /mnt/ -xf /usr/mdec/u-boots.tgz - cat > /tmp/boot.cmd<<__EOT -setenv bootargs sd0a:/bsd ; -mmc rescan ; -usb start ; -run findfdt ; -load mmc \${mmcdev}:1 \${loadaddr} bsd.umg ; -load mmc \${mmcdev}:1 \${fdt_addr_r} \${fdtfile} ; -bootm \${loadaddr} - \${fdt_addr_r} ; -__EOT - mkuboot -t script -a arm -o linux /tmp/boot.cmd /mnt/mnt/boot.scr + mkdir -p /mnt/mnt/efi/boot + cp /mnt/usr/mdec/BOOTARM.EFI /mnt/mnt/efi/boot/bootarm.efi if [[ ${MDPLAT} == "OMAP" ]]; then @@ -122,7 +107,21 @@ __EOT dd if=/mnt/usr/mdec/cubox/u-boot.img \ of=/dev/${_disk}c bs=1024 seek=69 >/dev/null elif [[ -n $NITROGEN ]]; then - mv /mnt/mnt/boot.scr /mnt/mnt/6x_bootscript + if [[ -f /mnt/bsd.${MDPLAT}.umg ]]; then + mv /mnt/bsd.${MDPLAT}.umg /mnt/mnt/bsd.umg + fi + if [[ -f /mnt/bsd.rd.${MDPLAT}.umg ]]; then + mv /mnt/bsd.rd.${MDPLAT}.umg /mnt/mnt/bsdrd.umg + fi + + cat > /tmp/boot.cmd<<__EOT +setenv bootargs sd0a:/bsd ; +mmc rescan ; +load mmc 0:1 \${loadaddr} bsd.umg ; +bootm \${loadaddr} +__EOT + mkuboot -t script -a arm -o linux /tmp/boot.cmd \ + /mnt/mnt/6x_bootscript elif [[ -n $WANDBOARD ]]; then cp /mnt/usr/mdec/wandboard/*.dtb /mnt/mnt/ dd if=/mnt/usr/mdec/wandboard/SPL \ |