[src/trunk]: src Switch the kernel7.img RaspberryPi kernel in the armv7 image...

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

details:   https://anonhg.NetBSD.org/src/rev/beedd8d3c257
branches:  trunk
changeset: 451361:beedd8d3c257
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat May 18 07:33:10 2019 +0000

description:
Switch the kernel7.img RaspberryPi kernel in the armv7 image to GENERIC
and thus reducing the number of kernels built in an evbarmv7 release.

diffstat:

 distrib/evbarm/instkernel/instkernel/Makefile |   4 ++--
 distrib/utils/embedded/conf/armv7.conf        |  17 +++++++++--------
 etc/etc.evbarm/Makefile.inc                   |   4 +---
 3 files changed, 12 insertions(+), 13 deletions(-)

diffs (92 lines):

diff -r a65b289c282b -r beedd8d3c257 distrib/evbarm/instkernel/instkernel/Makefile
--- a/distrib/evbarm/instkernel/instkernel/Makefile     Fri May 17 23:51:35 2019 +0000
+++ b/distrib/evbarm/instkernel/instkernel/Makefile     Sat May 18 07:33:10 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2017/12/14 06:29:15 skrll Exp $
+#      $NetBSD: Makefile,v 1.31 2019/05/18 07:33:10 skrll Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,7 @@
 
 MDSETTARGETS=
 .for i in ${BUILD_KERNELS:M*_INSTALL}
-.if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
+.if ${i} == "RPI_INSTALL"
 MDSETTARGETS+=         ${i}    ${SSHRAMDISK}   netbsd-${i}
 MDSET_SUFFIXES.netbsd-${i}=    bin create-bin  img create-img
 .else
diff -r a65b289c282b -r beedd8d3c257 distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf    Fri May 17 23:51:35 2019 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf    Sat May 18 07:33:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.33 2019/04/13 10:58:11 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.34 2019/05/18 07:33:10 skrll Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -11,7 +11,6 @@
 kernels_generic="GENERIC"
 # non-FDTised / special kernels
 kernels_beagle="BEAGLEBOARD BEAGLEBONE"
-kernels_rpi="RPI2"
 
 make_label() {
        make_label_evbarm
@@ -55,10 +54,10 @@
        firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
        firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 
-       # RPI2 kernel needs to be installed as kernel7.img
-       if [ -f "${mnt}/boot/netbsd-RPI2.img" ]; then
-               echo "${bar} renaming netbsd-RPI2.img to kernel7.img ${bar}"
-               mv "${mnt}/boot/netbsd-RPI2.img" "${mnt}/boot/kernel7.img"
+       # The GENERIC .img kernel needs to be installed as kernel7.img for RPI2
+       if [ -f "${mnt}/boot/netbsd-GENERIC.img" ]; then
+               echo "${bar} renaming netbsd-GENERIC.img to kernel7.img ${bar}"
+               mv "${mnt}/boot/netbsd-GENERIC.img" "${mnt}/boot/kernel7.img"
 
                cat > "${mnt}/boot/cmdline.txt" << EOF
 root=ld0a console=${console}
@@ -67,6 +66,8 @@
 EOF
 
                cat > ${mnt}/boot/config.txt << EOF
+# Boot options, see https://www.raspberrypi.org/documentation/configuration/config-txt/boot.md
+kernel_address=0x01000040
 # UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
 enable_uart=1
 force_turbo=0
@@ -134,12 +135,12 @@
                test -f "${f}" && kernels="${kernels} ${f}"
        done
        # .img kernels
-       for k in $kernels_rpi; do
+       for k in $kernels_generic; do
                f="${kernel}/netbsd-${k}.img.gz"
                test -f "${f}" && kernels="${kernels} ${f}"
        done
        # .dtb files
-       for k in $kernels_generic $kernels_rpi $; do
+       for k in $kernels_generic $; do
                test -d "${KERNOBJDIR}/${k}" && \
                    dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \
                    dtbs=
diff -r a65b289c282b -r beedd8d3c257 etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Fri May 17 23:51:35 2019 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Sat May 18 07:33:10 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.105 2019/03/31 13:04:54 jmcneill Exp $
+#      $NetBSD: Makefile.inc,v 1.106 2019/05/18 07:33:10 skrll Exp $
 #
 #      etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -108,8 +108,6 @@
 EVBARM_BOARDS.armv7hf+=                OVERO
 EVBARM_BOARDS.armv7+=          PANDABOARD
 EVBARM_BOARDS.armv7hf+=        PANDABOARD
-EVBARM_BOARDS.armv7+=          RPI2
-EVBARM_BOARDS.armv7hf+=                RPI2
 
 KERNEL_SETS.arm64+=            GENERIC64
 .endif