Module Name:    src
Committed By:   jmcneill
Date:           Sat Feb  9 11:19:55 UTC 2013

Modified Files:
        src/distrib/utils/embedded/conf: beagleboard.conf

Log Message:
keep beagleboard conf in sync with rpi


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/distrib/utils/embedded/conf/beagleboard.conf:1.6
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.5	Sun Feb  3 09:16:25 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf	Sat Feb  9 11:19:55 2013
@@ -1,15 +1,18 @@
-# $NetBSD: beagleboard.conf,v 1.5 2013/02/03 09:16:25 christos Exp $
+# $NetBSD: beagleboard.conf,v 1.6 2013/02/09 11:19:55 jmcneill Exp $
 # BeagleBoard customization script used by mkimage
 #
 board=beagleboard
-kernelconf=BEAGLEBOARD
-kerneldir=$src/sys/arch/evbarm/compile/obj/${kernelconf}
+kernel="$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub"
 
 . ${DIR}/conf/evbarm.conf
 
 kernelimg=netbsd.ub
 loadaddr=81000000
 
+make_filesystems() {
+	make_filesystems_evbarm
+}
+
 make_label() {
 	make_label_evbarm
 }
@@ -23,11 +26,17 @@ customize() {
 	cat >> ${mnt}/etc/rc.conf << EOF
 mdnsd=YES
 EOF  
+}
+
+populate() {
 	cat > ${mnt}/boot/uEnv.txt << EOF
 loaduimage=fatload mmc 0 ${loadaddr} ${kernelimg}; bootm ${loadaddr} root=ld0a
 EOF
-}
+	if [ ! -f "${kernel}" ]; then
+		echo ${PROG}: Missing ${kernel} 1>&1
+		exit 1
+	fi
 
-cleanup() {
-	cleanup_evbarm
+	echo "${bar} installing kernel ${bar}"
+	cp "${kernel}" "${mnt}/boot"
 }

Reply via email to