Module Name: src Committed By: skrll Date: Mon Jan 21 16:59:23 UTC 2013
Modified Files: src/distrib/utils/embedded/conf: evbarm.conf rpi.conf Log Message: kernel.img is for rpi only To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/evbarm.conf cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/conf/rpi.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/evbarm.conf diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.1 src/distrib/utils/embedded/conf/evbarm.conf:1.2 --- src/distrib/utils/embedded/conf/evbarm.conf:1.1 Wed Jan 16 23:27:34 2013 +++ src/distrib/utils/embedded/conf/evbarm.conf Mon Jan 21 16:59:23 2013 @@ -1,4 +1,4 @@ -# $NetBSD: evbarm.conf,v 1.1 2013/01/16 23:27:34 christos Exp $ +# $NetBSD: evbarm.conf,v 1.2 2013/01/21 16:59:23 skrll Exp $ # evbarm shared config # image=$HOME/${board}.img @@ -88,13 +88,6 @@ sshd=YES dhcpcd=YES mdnsd=YES EOF - if [ ! -f ${kerneldir}/kernel.img ]; then - echo ${PROG}: Missing ${kerneldir}/kernel.img 1>&2 - exit 1 - fi - echo "${bar} installing kernel ${bar}" - ${sudo} cp ${kerneldir}/kernel.img ${mnt}/boot - if [ ! -f ${mnt}/dev/MAKEDEV ]; then echo ${PROG}: Missing ${mnt}/dev/MAKEDEV 1>&2 exit 1 Index: src/distrib/utils/embedded/conf/rpi.conf diff -u src/distrib/utils/embedded/conf/rpi.conf:1.9 src/distrib/utils/embedded/conf/rpi.conf:1.10 --- src/distrib/utils/embedded/conf/rpi.conf:1.9 Wed Jan 16 23:27:34 2013 +++ src/distrib/utils/embedded/conf/rpi.conf Mon Jan 21 16:59:23 2013 @@ -1,4 +1,4 @@ -# $NetBSD: rpi.conf,v 1.9 2013/01/16 23:27:34 christos Exp $ +# $NetBSD: rpi.conf,v 1.10 2013/01/21 16:59:23 skrll Exp $ # Raspberry PI customization script used by mkimage # @@ -27,10 +27,18 @@ EOF ${sudo} cat > ${mnt}/boot/cmdline.txt << EOF console=fb -#fb=1280x1024 # to select a mode, otherwise EDID will be tried and fallback to +#fb=1280x1024 # to select a mode, otherwise try EDID #fb=disable # to disable fb completely EOF + if [ ! -f ${kerneldir}/kernel.img ]; then + echo ${PROG}: Missing ${kerneldir}/kernel.img 1>&2 + exit 1 + fi + + echo "${bar} installing kernel ${bar}" + ${sudo} cp ${kerneldir}/kernel.img ${mnt}/boot + echo -n "${bar} installing firmware files:" (cd ${mnt}/boot && for f in ${firmwarefiles}; do