Module Name: src
Committed By: jmcneill
Date: Wed Aug 21 22:52:28 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/embedded/conf/beagleboard.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.14 src/distrib/utils/embedded/conf/beagleboard.conf:1.15
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.14 Mon Aug 19 04:27:22 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Wed Aug 21 22:52:28 2013
@@ -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 @@ EOF
}
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 @@ EOF
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 @@ EOF
;;
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}"
