summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2015-07-07 03:31:58 +0000
committerjsg <jsg@openbsd.org>2015-07-07 03:31:58 +0000
commite9f087d084b637c412bdd872d5813486b11b7e7d (patch)
tree3cca1ea06e2d20bf09ab330fdc2dc05a1ef69615
parentRemove some unneeded includes. OK deraadt@ (diff)
downloadwireguard-openbsd-e9f087d084b637c412bdd872d5813486b11b7e7d.tar.xz
wireguard-openbsd-e9f087d084b637c412bdd872d5813486b11b7e7d.zip
At some point the u-boot mlo for panda/beagle stopped looking for
u-boot.bin and required u-boot.img on the fat fs so switch to using that as we do for beaglebone. Reported by abieber@ via bmercer@
-rw-r--r--distrib/armv7/ramdisk/install.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index e13664f632b..03f5af000db 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.16 2015/06/29 04:52:34 jsg Exp $
+# $OpenBSD: install.md,v 1.17 2015/07/07 03:31:58 jsg Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -92,11 +92,11 @@ md_installboot() {
if [[ ${MDPLAT} == "OMAP" ]]; then
if [[ -n $BEAGLE ]]; then
- cp /mnt/usr/mdec/beagle/{mlo,u-boot.bin} /mnt/mnt/
+ cp /mnt/usr/mdec/beagle/{mlo,u-boot.img} /mnt/mnt/
elif [[ -n $BEAGLEBONE ]]; then
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/
+ cp /mnt/usr/mdec/panda/{mlo,u-boot.img} /mnt/mnt/
fi
cat > /mnt/mnt/uenv.txt<<__EOT
bootcmd=mmc rescan ; setenv loadaddr ${LOADADDR}; setenv bootargs sd0i:/bsd.umg ; fatload mmc \${mmcdev} \${loadaddr} bsd.umg ; bootm \${loadaddr} ;