[src/trunk]: src Add RPI2 to kernels build for both earmv[67].

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

details:   https://anonhg.NetBSD.org/src/rev/279b69171579
branches:  trunk
changeset: 336563:279b69171579
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Mar 06 11:11:55 2015 +0000

description:
Add RPI2 to kernels build for both earmv[67].

Use the earmv6 built kernels to create an image that can be used on both
RPI and RPI2

diffstat:

 distrib/utils/embedded/conf/rpi.conf |  16 ++++++++++++++--
 etc/etc.evbarm/Makefile.inc          |   7 ++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diffs (79 lines):

diff -r d250de43590b -r 279b69171579 distrib/utils/embedded/conf/rpi.conf
--- a/distrib/utils/embedded/conf/rpi.conf      Fri Mar 06 09:28:15 2015 +0000
+++ b/distrib/utils/embedded/conf/rpi.conf      Fri Mar 06 11:11:55 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.26 2015/02/12 10:59:44 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.27 2015/03/06 11:11:55 skrll Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -48,6 +48,8 @@
 }
 
 populate() {
+       rpi2_kernel="$(echo $kernel | sed 's/RPI/RPI2/g')"
+
        cat > ${mnt}/boot/cmdline.txt << EOF
 root=ld0a console=fb
 #fb=1280x1024          # to select a mode, otherwise try EDID 
@@ -58,7 +60,7 @@
                exit 1
        fi
 
-       echo "${bar} installing kernel ${bar}"
+       echo "${bar} installing RPI kernel ${bar}"
        case ${kernel} in
        *.gz)
                gzip -dc ${kernel} > ${mnt}/boot/kernel.img
@@ -68,6 +70,16 @@
                ;;
        esac
 
+       echo "${bar} installing RPI2 kernel ${bar}"
+       case ${rpi2_kernel} in
+       *.gz)
+               gzip -dc ${rpi2_kernel} > ${mnt}/boot/kernel7.img
+               ;;
+       *)
+               cp ${rpi_kernel} ${mnt}/boot/kernel7.img
+               ;;
+       esac
+
        echo "${bar} installing firmware files ${bar}"
        (cd ${mnt}/boot &&
                for f in ${firmwarefiles}; do
diff -r d250de43590b -r 279b69171579 etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Fri Mar 06 09:28:15 2015 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Fri Mar 06 11:11:55 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.69 2015/02/26 14:00:17 kiyohara Exp $
+#      $NetBSD: Makefile.inc,v 1.70 2015/03/06 11:11:55 skrll Exp $
 #
 #      etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -71,6 +71,8 @@
 #EVBARM_BOARDS.armv6hf+=       IMX31LITE
 EVBARM_BOARDS.armv6+=          RPI
 EVBARM_BOARDS.armv6hf+=                RPI
+KERNEL_SETS.armv6+=            RPI2
+KERNEL_SETS.armv6hf+=          RPI2
 EVBARM_BOARDS.armv6+=          TISDP2420
 EVBARM_BOARDS.armv6hf+=        TISDP2420
 #EVBARM_BOARDS.armv6+=         TISDP2430
@@ -108,6 +110,8 @@
 EVBARM_BOARDS.armv7hf+=                OVERO
 EVBARM_BOARDS.armv7+=          PANDABOARD
 EVBARM_BOARDS.armv7hf+=        PANDABOARD
+EVBARM_BOARDS.armv7+=          RPI2
+EVBARM_BOARDS.armv7hf+=                RPI2
 EVBARM_BOARDS.armv7+=          KOBO
 EVBARM_BOARDS.armv7hf+=        KOBO
 .endif
@@ -166,6 +170,7 @@
 
 .if !empty(KERNEL_SETS:MRPI)
 smp_rpi: ${IMAGE.kern}/netbsd-RPI.bin.gz __mkimage
+#            XXX ${IMAGE.kern}/netbsd-RPI2.bin.gz
 .if empty(ALL_KERNELS) || !empty(ALL_KERNELS:MRPI)
 SNAP_MD_POST_DEPS+=    smp_rpi
 .endif