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 following revision(s)...



details:   https://anonhg.NetBSD.org/src/rev/23b6aad2581a
branches:  netbsd-7
changeset: 798384:23b6aad2581a
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Sep 30 18:19:18 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #121):
        distrib/utils/embedded/conf/beagleboard.conf: revision 1.18
Escape $ in $board so this will boot on beaglebone too.

diffstat:

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

diffs (18 lines):

diff -r 650c606b7399 -r 23b6aad2581a distrib/utils/embedded/conf/beagleboard.conf
--- a/distrib/utils/embedded/conf/beagleboard.conf      Tue Sep 30 18:14:22 2014 +0000
+++ b/distrib/utils/embedded/conf/beagleboard.conf      Tue Sep 30 18:19:18 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: beagleboard.conf,v 1.17 2013/09/16 15:23:57 ast Exp $
+# $NetBSD: beagleboard.conf,v 1.17.4.1 2014/09/30 18:19:18 martin Exp $
 # BeagleBoard customization script used by mkimage
 #
 board=beagleboard
@@ -34,7 +34,7 @@
        bbone_kernel="$(echo $bboard_kernel | sed 's/BEAGLEBOARD/BEAGLEBONE/g')"
 
        cat > ${mnt}/boot/uEnv.txt << EOF
-loaduimage=if test $board = am335x; then fatload mmc 0 ${bbone_loadaddr} ${bbone_kernelimg}; bootm ${bbone_loadaddr} root=ld0a; else fatload mmc 0 ${bboard_loadaddr} ${bboard_kernelimg}; bootm 
${bboard_loadaddr} root=ld0a; fi
+loaduimage=if test \$board = am335x; then fatload mmc 0 ${bbone_loadaddr} ${bbone_kernelimg}; bootm ${bbone_loadaddr} root=ld0a; else fatload mmc 0 ${bboard_loadaddr} ${bboard_kernelimg}; bootm 
${bboard_loadaddr} root=ld0a; fi
 EOF
        if [ ! -f "${bboard_kernel}" ]; then
                echo ${PROG}: Missing ${bboard_kernel} 1>&2



Home | Main Index | Thread Index | Old Index