[src/trunk]: src/distrib/utils/embedded Switch to GENERIC kernels only.

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

details:   https://anonhg.NetBSD.org/src/rev/a9a75bf30a43
branches:  trunk
changeset: 460550:a9a75bf30a43
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 27 21:38:58 2019 +0000

description:
Switch to GENERIC kernels only.

diffstat:

 distrib/utils/embedded/conf/armv7.conf      |  27 ++-------------------------
 distrib/utils/embedded/files/armv7_boot.cmd |  19 +++----------------
 2 files changed, 5 insertions(+), 41 deletions(-)

diffs (104 lines):

diff -r 791b6204aa1b -r a9a75bf30a43 distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf    Sun Oct 27 21:35:02 2019 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf    Sun Oct 27 21:38:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.35 2019/07/21 16:05:24 rin Exp $
+# $NetBSD: armv7.conf,v 1.36 2019/10/27 21:38:58 jmcneill Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -7,10 +7,7 @@
 
 . ${DIR}/conf/evbarm.conf
 
-# altera, exynos, sunxi, tegra
 kernels_generic="GENERIC"
-# non-FDTised / special kernels
-kernels_beagle="BEAGLEBOARD BEAGLEBONE"
 
 make_label() {
        make_label_evbarm
@@ -50,10 +47,6 @@
        "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
 }
 
-populate_beagle() {
-       :
-}
-
 populate_rpi() {
        firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
        firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
@@ -105,10 +98,6 @@
            >> "$tmp/selected_sets"
 }
 
-populate_altera() {
-       :
-}
-
 populate_amlogic() {
        odroidc1_kernelimg=netbsd-GENERIC.ub
 
@@ -122,19 +111,11 @@
 EOF
 }
 
-populate_sunxi() {
-       :
-}
-
-populate_tegra() {
-       :
-}
-
 populate() {
        echo "${bar} looking for kernels in ${kernel} ${bar}"
        kernels=""
        # .ub kernels
-       for k in $kernels_generic $kernels_beagle; do
+       for k in $kernels_generic; do
                f="${kernel}/netbsd-${k}.ub.gz"
                test -f "${f}" && kernels="${kernels} ${f}"
        done
@@ -170,12 +151,8 @@
        done
 
        # board specific configuration
-       populate_altera
        populate_amlogic
-       populate_beagle
        populate_rpi
-       populate_sunxi
-       populate_tegra
 
        # common configuration
        populate_common
diff -r 791b6204aa1b -r a9a75bf30a43 distrib/utils/embedded/files/armv7_boot.cmd
--- a/distrib/utils/embedded/files/armv7_boot.cmd       Sun Oct 27 21:35:02 2019 +0000
+++ b/distrib/utils/embedded/files/armv7_boot.cmd       Sun Oct 27 21:38:58 2019 +0000
@@ -1,21 +1,8 @@
-if test "${board}" = "am335x" ; then
-       setenv kernel netbsd-BEAGLEBONE.ub
-       setenv mmcpart 0:1
-       setenv bootargs root=ld0a
-else
-       setenv use_efi 1
-fi
-
 if test "${soc}" = "tegra210" ; then
        # enable PCIe
        pci enum
 fi
 
-if test "${use_efi}" = "1" ; then
-       setenv boot_scripts
-       setenv boot_script_dhcp
-       run distro_bootcmd
-else
-       fatload mmc ${mmcpart} ${kernel_addr_r} ${kernel}
-       bootm ${kernel_addr_r} ${bootargs}
-fi
+setenv boot_scripts
+setenv boot_script_dhcp
+run distro_bootcmd