[src/trunk]: src/distrib/utils/embedded/conf kernel.img is for rpi only

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

details:   https://anonhg.NetBSD.org/src/rev/1bfd183fb0fd
branches:  trunk
changeset: 784196:1bfd183fb0fd
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Jan 21 16:59:23 2013 +0000

description:
kernel.img is for rpi only

diffstat:

 distrib/utils/embedded/conf/evbarm.conf |   9 +--------
 distrib/utils/embedded/conf/rpi.conf    |  12 ++++++++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r 9516e2142f64 -r 1bfd183fb0fd distrib/utils/embedded/conf/evbarm.conf
--- a/distrib/utils/embedded/conf/evbarm.conf   Mon Jan 21 16:52:56 2013 +0000
+++ b/distrib/utils/embedded/conf/evbarm.conf   Mon Jan 21 16:59:23 2013 +0000
@@ -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 @@
 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
diff -r 9516e2142f64 -r 1bfd183fb0fd distrib/utils/embedded/conf/rpi.conf
--- a/distrib/utils/embedded/conf/rpi.conf      Mon Jan 21 16:52:56 2013 +0000
+++ b/distrib/utils/embedded/conf/rpi.conf      Mon Jan 21 16:59:23 2013 +0000
@@ -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 @@
 
        ${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