diff options
| author | Mats O Jansson <maja@cvs.openbsd.org> | 2014-02-26 16:01:33 +0000 |
|---|---|---|
| committer | Mats O Jansson <maja@cvs.openbsd.org> | 2014-02-26 16:01:33 +0000 |
| commit | ae9c45795abe1f63754a78164ff10d258b3127fe (patch) | |
| tree | c64a7f98487b1194d0a04f9d5ccd495611730f03 /distrib | |
| parent | 6d2d4998bb91781a29ad9121c47454f030c45da6 (diff) | |
Fix script to allow it to work on both SD and eMMC. -moj ok deraadt@ nick@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/armv7/miniroot/Makefile.inc | 2 | ||||
| -rw-r--r-- | distrib/armv7/ramdisk/install.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc index 96894ae5161..10dbc670fdb 100644 --- a/distrib/armv7/miniroot/Makefile.inc +++ b/distrib/armv7/miniroot/Makefile.inc @@ -42,7 +42,7 @@ ${IMAGE}: rd_setup do_files rd_teardown do_files: .if ${PLATFORM} == "OMAP" cp /usr/mdec/${BOARD}/mlo ${MOUNT_POINT}/mlo - echo "bootcmd=mmc rescan ; setenv loadaddr ${LOADADDR} ; setenv bootargs sd0i:/bsd.umg ; fatload mmc 0 \$${loadaddr} bsd.umg ; bootm \$${loadaddr} ;\nuenvcmd=boot" > ${MOUNT_POINT}/uenv.txt + echo "bootcmd=mmc rescan ; setenv loadaddr ${LOADADDR} ; setenv bootargs sd0i:/bsd.umg ; fatload mmc \$${mmcdev} \$${loadaddr} bsd.umg ; bootm \$${loadaddr} ;\nuenvcmd=boot" > ${MOUNT_POINT}/uenv.txt cp /usr/mdec/${BOARD}/u-boot.* ${MOUNT_POINT}/ mkdir ${MOUNT_POINT}/u-boots cp -r /usr/mdec/{am335x,beagle,panda} ${MOUNT_POINT}/u-boots diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md index fe5def313ff..b493d37d5ce 100644 --- a/distrib/armv7/ramdisk/install.md +++ b/distrib/armv7/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.4 2013/11/16 18:37:26 rpe Exp $ +# $OpenBSD: install.md,v 1.5 2014/02/26 16:01:32 maja Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ md_installboot() { cp /mnt/usr/mdec/panda/{mlo,u-boot.bin} /mnt/mnt/ fi cat > /mnt/mnt/uenv.txt<<__EOT -bootcmd=mmc rescan ; setenv loadaddr ${LOADADDR}; setenv bootargs sd0i:/bsd.umg ; fatload mmc 0 \${loadaddr} bsd.umg ; bootm \${loadaddr} ; +bootcmd=mmc rescan ; setenv loadaddr ${LOADADDR}; setenv bootargs sd0i:/bsd.umg ; fatload mmc \${mmcdev} \${loadaddr} bsd.umg ; bootm \${loadaddr} ; uenvcmd=boot __EOT elif [[ ${MDPLAT} == "IMX" ]]; then |