Module Name: src
Committed By: martin
Date: Wed Jul 15 11:29:16 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Properly escape the $ when trying to pass the u-boot env var $kernel.
>From Rin Okuyama.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/conf/armv7.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.5 src/distrib/utils/embedded/conf/armv7.conf:1.6
--- src/distrib/utils/embedded/conf/armv7.conf:1.5 Wed Jul 8 10:57:46 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Wed Jul 15 11:29:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.5 2015/07/08 10:57:46 skrll Exp $
+# $NetBSD: armv7.conf,v 1.6 2015/07/15 11:29:16 martin Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -45,7 +45,7 @@ EOF
populate_awin() {
cat >> "${mnt}/boot/uEnv.txt" << EOF
bootargs=root=ld0a console=${console}
-uenvcmd=mmc dev 0; mmc rescan; if test \$fdtfile = sun7i-a20-cubieboard2.dtb; then setenv kernel netbsd-CUBIEBOARD2.ub; elif test \$fdtfile = sun7i-a20-cubietruck.dtb; then setenv kernel netbsd-CUBIETRUCK.ub; elif test \$fdtfile = sun6i-a31-hummingbird.dtb; then setenv kernel netbsd-HUMMINGBIRD_A31.ub; elif test \$fdtfile = sun7i-a20-bananapi.dtb; then setenv kernel netbsd-BPI.ub; fi; fatload mmc 0:1 82000000 ${kernel}; bootm 82000000
+uenvcmd=mmc dev 0; mmc rescan; if test \$fdtfile = sun7i-a20-cubieboard2.dtb; then setenv kernel netbsd-CUBIEBOARD2.ub; elif test \$fdtfile = sun7i-a20-cubietruck.dtb; then setenv kernel netbsd-CUBIETRUCK.ub; elif test \$fdtfile = sun6i-a31-hummingbird.dtb; then setenv kernel netbsd-HUMMINGBIRD_A31.ub; elif test \$fdtfile = sun7i-a20-bananapi.dtb; then setenv kernel netbsd-BPI.ub; fi; fatload mmc 0:1 82000000 \$kernel; bootm 82000000
EOF
}
