Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src/distrib/utils/embedded/conf Pull up the following revisio...



details:   https://anonhg.NetBSD.org/src/rev/6ce3f598d023
branches:  netbsd-7
changeset: 799577:6ce3f598d023
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 30 09:56:19 2015 +0000

description:
Pull up the following revision, requested by snj in #961:

        src/distrib/utils/embedded/conf/armv7.conf      r1.6

Properly escape the $ when trying to pass the u-boot env var $kernel.
>From Rin Okuyama.

diffstat:

 distrib/utils/embedded/conf/armv7.conf |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 8eb395f85297 -r 6ce3f598d023 distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf    Sat Aug 22 18:09:34 2015 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf    Sun Aug 30 09:56:19 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.7.2.4 2015/08/22 16:35:31 snj Exp $
+# $NetBSD: armv7.conf,v 1.7.2.5 2015/08/30 09:56:19 martin Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -44,7 +44,7 @@
 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-CUBIEBOARD.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-CUBIEBOARD.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
 }
 



Home | Main Index | Thread Index | Old Index