diff options
| author |   jsg <jsg@openbsd.org> | 2016-05-28 10:10:36 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2016-05-28 10:10:36 +0000 |
| commit | 7398d93a6eac8a69deffa42bb39ccaffb151b4a9 (patch) | |
| tree | 30a8c731b5c72b6441fd921a229462aeb4113823 | |
| parent | use efiboot in armv7 miniroot images (diff) | |
| download | wireguard-openbsd-7398d93a6eac8a69deffa42bb39ccaffb151b4a9.tar.xz wireguard-openbsd-7398d93a6eac8a69deffa42bb39ccaffb151b4a9.zip | |
Assume sabrelite/nitrogen has a bootefi enabled u-boot in flash and just
install dtbs and efiboot on the fat fs.
| -rw-r--r-- | distrib/armv7/miniroot/Makefile.inc | 3 | ||||
| -rw-r--r-- | distrib/armv7/ramdisk/install.md | 18 |
2 files changed, 3 insertions, 18 deletions
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc index dcd1eed8ce4..11c01d1f481 100644 --- a/distrib/armv7/miniroot/Makefile.inc +++ b/distrib/armv7/miniroot/Makefile.inc @@ -53,8 +53,7 @@ do_files: cp /usr/mdec/${BOARD}/*.dtb ${MOUNT_POINT}/ .endif .if ${BOARD} == "nitrogen" - ${MKUBOOT} -t script -a arm -o linux \ - ${.CURDIR}/../boot.cmd ${MOUNT_POINT}/6x_bootscript + cp /usr/mdec/${BOARD}/*.dtb ${MOUNT_POINT}/ .endif .if ${BOARD} == "cubox" || ${BOARD} == "wandboard" cp /usr/mdec/${BOARD}/*.dtb ${MOUNT_POINT}/ diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md index 3f42f2f13ad..1df9575eb72 100644 --- a/distrib/armv7/ramdisk/install.md +++ b/distrib/armv7/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.32 2016/05/26 00:34:50 jsg Exp $ +# $OpenBSD: install.md,v 1.33 2016/05/28 10:10:36 jsg Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -101,21 +101,7 @@ md_installboot() { dd if=/mnt/usr/mdec/cubox/u-boot.img \ of=/dev/${_disk}c bs=1024 seek=69 >/dev/null elif [[ -n $NITROGEN ]]; then - 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 + cp /mnt/usr/mdec/nitrogen/*.dtb /mnt/mnt/ elif [[ -n $WANDBOARD ]]; then cp /mnt/usr/mdec/wandboard/*.dtb /mnt/mnt/ dd if=/mnt/usr/mdec/wandboard/SPL \ |