[src/trunk]: src/etc/etc.evbarm Use the GENERIC kernel where possible in armv...

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

details:   https://anonhg.NetBSD.org/src/rev/0de07e1e2cc1
branches:  trunk
changeset: 994331:0de07e1e2cc1
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Nov 01 11:05:24 2018 +0000

description:
Use the GENERIC kernel where possible in armv7.img and remove the old
kernels from the bulid for SUNXI and TEGRA.

While I'm here disable *_INSTALL kernel builds for boards supported by
armv7.img

diffstat:

 distrib/utils/embedded/conf/armv7.conf      |  13 +++++++------
 distrib/utils/embedded/files/armv7_boot.cmd |  14 ++++++++++----
 etc/etc.evbarm/Makefile.inc                 |  24 +++++++++++++-----------
 3 files changed, 30 insertions(+), 21 deletions(-)

diffs (148 lines):

diff -r 19d2a33b9ada -r 0de07e1e2cc1 distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf    Thu Nov 01 10:48:48 2018 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf    Thu Nov 01 11:05:24 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.25 2018/10/20 08:26:10 skrll Exp $
+# $NetBSD: armv7.conf,v 1.26 2018/11/01 11:05:24 skrll Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -7,11 +7,12 @@
 
 . ${DIR}/conf/evbarm.conf
 
+# exynos, sunxi, tegra
+kernels_generic="GENERIC"
+# non-FDTised / special kernels
 kernels_amlogic="ODROID-C1"
 kernels_beagle="BEAGLEBOARD BEAGLEBONE"
 kernels_rpi="RPI2"
-kernels_sunxi="SUNXI"
-kernels_tegra="TEGRA"
 
 make_label() {
        make_label_evbarm
@@ -97,7 +98,7 @@
 ODROIDC-UBOOT-CONFIG
 
 setenv bootargs "root=ld0a awge0.mac-address=\${ethaddr} console=${console}"
-setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; bootm 0x21000000"
+setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; fatload mmc 0:1 0x20000000 meson8b-odroidc1.dtb; bootm 0x21000000 - 0x20000000"
 run bootcmd
 EOF
 }
@@ -116,7 +117,7 @@
        echo "${bar} looking for kernels in ${kernel} ${bar}"
        kernels=""
        # .ub kernels
-       for k in $kernels_beagle $kernels_sunxi $kernels_amlogic $kernels_tegra; do
+       for k in $kernels_generic $kernels_amlogic $kernels_beagle; do
                f="${kernel}/netbsd-${k}.ub.gz"
                test -f "${f}" && kernels="${kernels} ${f}"
        done
@@ -126,7 +127,7 @@
                test -f "${f}" && kernels="${kernels} ${f}"
        done
        # .dtb files
-       for k in $kernels_rpi $kernels_sunxi $kernels_tegra; do
+       for k in $kernels_generic $kernels_amlogic $kernels_rpi $; do
                test -d "${KERNOBJDIR}/${k}" && \
                    dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \
                    dtbs=
diff -r 19d2a33b9ada -r 0de07e1e2cc1 distrib/utils/embedded/files/armv7_boot.cmd
--- a/distrib/utils/embedded/files/armv7_boot.cmd       Thu Nov 01 10:48:48 2018 +0000
+++ b/distrib/utils/embedded/files/armv7_boot.cmd       Thu Nov 01 11:05:24 2018 +0000
@@ -4,25 +4,31 @@
        setenv bootargs root=ld0a
 fi
 if test "${soc}" = "exynos" ; then
-       setenv kernel netbsd-EXYNOS.ub
+       setenv kernel netbsd-GENERIC.ub
        setenv bootargs 'root=ld1a'
        setenv mmcpart 0:1
        setenv use_fdt 1
 fi
 if test "${soc}" = "sunxi" ; then
-       setenv kernel netbsd-SUNXI.ub
+       setenv kernel netbsd-GENERIC.ub
        setenv bootargs 'root=ld0a'
        setenv mmcpart 0:1
        setenv use_fdt 1
 fi
 if test "${soc}" = "tegra" ; then
-       setenv kernel netbsd-TEGRA.ub
+       setenv kernel netbsd-GENERIC.ub
        setenv bootargs root=ld1a
        setenv mmcpart 1:1
        setenv use_fdt 1
 fi
+if test "${soc}" = "tegra124" ; then
+       setenv kernel netbsd-GENERIC.ub
+       setenv bootargs root=ld0a
+       setenv mmcpart 1:1
+       setenv use_fdt 1
+fi
 if test "${soc}" = "tegra210" ; then
-       setenv kernel netbsd-TEGRA.ub
+       setenv kernel netbsd-GENERIC.ub
        setenv bootargs root=ld0a
        setenv mmcpart 1:1
        setenv use_fdt 1
diff -r 19d2a33b9ada -r 0de07e1e2cc1 etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Thu Nov 01 10:48:48 2018 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Thu Nov 01 11:05:24 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.95 2018/10/21 07:08:40 skrll Exp $
+#      $NetBSD: Makefile.inc,v 1.96 2018/11/01 11:05:24 skrll Exp $
 #
 #      etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -86,16 +86,18 @@
 EVBARM_BOARDS.armv7hf+=        BCM5301X
 #EVBARM_BOARDS.armv7+=         BCM56340
 #EVBARM_BOARDS.armv7hf+=       BCM56340
-EVBARM_BOARDS.armv7+=          BEAGLEBOARD
-EVBARM_BOARDS.armv7hf+=        BEAGLEBOARD
+KERNEL_SETS.armv7+=            BEAGLEBOARD
+KERNEL_SETS.armv7hf+=          BEAGLEBOARD
 EVBARM_BOARDS.armv7+=          BEAGLEBOARDXM
 EVBARM_BOARDS.armv7hf+=        BEAGLEBOARDXM
-EVBARM_BOARDS.armv7+=          BEAGLEBONE
-EVBARM_BOARDS.armv7hf+=        BEAGLEBONE
+KERNEL_SETS.armv7+=            BEAGLEBONE
+KERNEL_SETS.armv7hf+=          BEAGLEBONE
 EVBARM_BOARDS.armv7+=          CUBOX
 EVBARM_BOARDS.armv7hf+=        CUBOX
 EVBARM_BOARDS.armv7+=          CUBOX-I
 EVBARM_BOARDS.armv7hf+=        CUBOX-I
+KERNEL_SETS.armv7+=            GENERIC
+KERNEL_SETS.armv7hf+=          GENERIC
 #EVBARM_BOARDS.armv7+=         IGEPV2
 EVBARM_BOARDS.armv7+=          IMX6UL-STARTER
 EVBARM_BOARDS.armv7hf+=                IMX6UL-STARTER
@@ -106,8 +108,8 @@
 #EVBARM_BOARDS.armv7+=         N900
 EVBARM_BOARDS.armv7+=          NETWALKER
 EVBARM_BOARDS.armv7hf+=                NETWALKER
-EVBARM_BOARDS.armv7+=          ODROID-C1
-EVBARM_BOARDS.armv7hf+=                ODROID-C1
+KERNEL_SETS.armv7+=            ODROID-C1
+KERNEL_SETS.armv7hf+=          ODROID-C1
 EVBARM_BOARDS.armv7+=          OMAP5EVM
 EVBARM_BOARDS.armv7hf+=                OMAP5EVM
 EVBARM_BOARDS.armv7+=          OVERO
@@ -116,10 +118,10 @@
 EVBARM_BOARDS.armv7hf+=        PANDABOARD
 EVBARM_BOARDS.armv7+=          RPI2
 EVBARM_BOARDS.armv7hf+=                RPI2
-KERNEL_SETS.armv7+=            SUNXI
-KERNEL_SETS.armv7hf+=          SUNXI
-KERNEL_SETS.armv7+=            TEGRA
-KERNEL_SETS.armv7hf+=          TEGRA
+#KERNEL_SETS.armv7+=           SUNXI
+#KERNEL_SETS.armv7hf+=         SUNXI
+#KERNEL_SETS.armv7+=           TEGRA
+#KERNEL_SETS.armv7hf+=         TEGRA
 KERNEL_SETS.armv7+=            VEXPRESS_A15
 KERNEL_SETS.armv7hf+=          VEXPRESS_A15