[src/trunk]: src/distrib/utils/embedded/conf No need to rename netbsd-GENERIC...

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

details:   https://anonhg.NetBSD.org/src/rev/995bf9aadc54
branches:  trunk
changeset: 933362:995bf9aadc54
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon May 25 11:11:52 2020 +0000

description:
No need to rename netbsd-GENERIC.img to kernel7.img

diffstat:

 distrib/utils/embedded/conf/armv7.conf |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (31 lines):

diff -r 3c04d82a271a -r 995bf9aadc54 distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf    Mon May 25 11:06:49 2020 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf    Mon May 25 11:11:52 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.42 2020/05/25 11:06:49 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.43 2020/05/25 11:11:52 jmcneill Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -56,11 +56,8 @@
        firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
        firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 
-       # The GENERIC .img kernel needs to be installed as kernel7.img for RPI2
+       # The GENERIC .img kernel img is used 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=NAME=${gpt_label_ffs} console=${console}
 #fb=1280x1024          # to select a mode, otherwise try EDID
@@ -72,7 +69,7 @@
 upstream_kernel=1
 os_prefix=dtb/
 cmdline=../cmdline.txt
-kernel=/kernel7.img
+kernel=/netbsd-GENERIC.img
 # 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