[src/trunk]: src/distrib/utils/embedded/conf 4th time's a charm (I hope). Mak...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d245027e7c7c
branches:  trunk
changeset: 789554:d245027e7c7c
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Aug 21 22:52:28 2013 +0000

description:
4th time's a charm (I hope). Make sure that we pick up the kernel path passed to
mkimage command line, and not the default.

diffstat:

 distrib/utils/embedded/conf/beagleboard.conf |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 8ebcee0b8cb9 -r d245027e7c7c distrib/utils/embedded/conf/beagleboard.conf
--- a/distrib/utils/embedded/conf/beagleboard.conf      Wed Aug 21 21:17:37 2013 +0000
+++ b/distrib/utils/embedded/conf/beagleboard.conf      Wed Aug 21 22:52:28 2013 +0000
@@ -1,13 +1,8 @@
-# $NetBSD: beagleboard.conf,v 1.14 2013/08/19 04:27:22 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.15 2013/08/21 22:52:28 jmcneill Exp $
 # BeagleBoard customization script used by mkimage
 #
 board=beagleboard
 
-kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub"
-
-bboard_kernel="$kernel"
-bbone_kernel="$(echo $bboard_kernel | sed 's/BEAGLEBOARD/BEAGLEBONE/g')"
-
 . ${DIR}/conf/evbarm.conf
 
 bboard_kernelimg=bboard.ub
@@ -35,6 +30,9 @@
 }
 
 populate() {
+       bboard_kernel="$kernel"
+       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
 EOF
@@ -47,7 +45,7 @@
                exit 1
        fi
 
-       echo "${bar} installing BEAGLEBOARD kernel to /boot ${bar}"
+       echo "${bar} installing ${bboard_kernel} to /boot/${bboard_kernelimg} ${bar}"
        case "${bboard_kernel}" in
        *.gz)
                gzip -dc "${bboard_kernel}" > "${mnt}/boot/${bboard_kernelimg}"
@@ -57,7 +55,7 @@
                ;;
        esac
 
-       echo "${bar} installing BEAGLEBONE kernel to /boot ${bar}"
+       echo "${bar} installing ${bbone_kernel} to /boot/${bbone_kernelimg} ${bar}"
        case "${bbone_kernel}" in
        *.gz)
                gzip -dc "${bbone_kernel}" > "${mnt}/boot/${bbone_kernelimg}"