Module Name: src
Committed By: jmcneill
Date: Sun Oct 8 00:15:13 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Don't install uEnv.txt for beagle; boot.scr handles this now.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 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.17 src/distrib/utils/embedded/conf/armv7.conf:1.18
--- src/distrib/utils/embedded/conf/armv7.conf:1.17 Sat Oct 7 23:40:00 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Oct 8 00:15:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.17 2017/10/07 23:40:00 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.18 2017/10/08 00:15:13 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -38,15 +38,7 @@ populate_common() {
}
populate_beagle() {
- bboard_kernelimg=netbsd-BEAGLEBOARD.ub
- bboard_loadaddr=81000000
- bbone_kernelimg=netbsd-BEAGLEBONE.ub
- bbone_loadaddr=82000000
-
- # Create a uEnv.txt to auto boot the correct kernel
- 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
+ :
}
populate_awin() {
