diff options
| author |   rapha <rapha@openbsd.org> | 2013-07-15 15:49:33 +0000 |
|---|---|---|
| committer | rapha <rapha@openbsd.org> | 2013-07-15 15:49:33 +0000 |
| commit | 22ce99f785d86ffbb59da0df0718f4c2057ef5d2 (patch) | |
| tree | bb023fd3ae3c90bd0c47510f5435d4a81084608f | |
| parent | If a DHCPREQUEST returns a lease identical to the one currently bound to (diff) | |
| download | wireguard-openbsd-22ce99f785d86ffbb59da0df0718f4c2057ef5d2.tar.xz wireguard-openbsd-22ce99f785d86ffbb59da0df0718f4c2057ef5d2.zip | |
Fix mlo/u-boot copying, pointed out by florian.
ok florian@, bmercer@
| -rw-r--r-- | distrib/beagle/miniroot/Makefile.inc | 2 | ||||
| -rw-r--r-- | distrib/beagle/ramdisk/install.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/distrib/beagle/miniroot/Makefile.inc b/distrib/beagle/miniroot/Makefile.inc index 20e339d905a..370271bb2ac 100644 --- a/distrib/beagle/miniroot/Makefile.inc +++ b/distrib/beagle/miniroot/Makefile.inc @@ -32,7 +32,7 @@ ${IMAGE}: rd_setup do_files rd_teardown do_files: echo 'bootcmd=mmc rescan ; setenv loadaddr 0x82800000 ; setenv bootargs sd0i:/bsd.umg ; fatload mmc 0 $${loadaddr} bsd.umg ; bootm $${loadaddr} ;\nuenvcmd=boot' > ${MOUNT_POINT}/uenv.txt cp /usr/mdec/${BOARD}/mlo ${MOUNT_POINT}/mlo - cp /usr/mdec/${BOARD}/u-boot.bin ${MOUNT_POINT}/u-boot.bin + cp /usr/mdec/${BOARD}/u-boot.* ${MOUNT_POINT}/ mkdir ${MOUNT_POINT}/u-boots cp -r /usr/mdec/{am335x,beagle,panda} ${MOUNT_POINT}/u-boots objcopy -O binary ${.OBJDIR}/../../ramdisk/bsd.rd \ diff --git a/distrib/beagle/ramdisk/install.md b/distrib/beagle/ramdisk/install.md index 5a295fe2db1..bd551023a31 100644 --- a/distrib/beagle/ramdisk/install.md +++ b/distrib/beagle/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.6 2013/07/09 10:35:41 rapha Exp $ +# $OpenBSD: install.md,v 1.7 2013/07/15 15:49:33 rapha Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ md_installboot() { if [[ -n $BEAGLE ]]; then cp /mnt/usr/mdec/beagle/{mlo,u-boot.bin} /mnt/mnt/ elif [[ -n $BEAGLEBONE ]]; then - cp /mnt/usr/mdec/am335x/{mlo,u-boot.bin} /mnt/mnt/ + cp /mnt/usr/mdec/am335x/{mlo,u-boot.img} /mnt/mnt/ elif [[ -n $PANDA ]]; then cp /mnt/usr/mdec/panda/{mlo,u-boot.bin} /mnt/mnt/ fi |