Wed Apr 19 18:39:18 2023 UTC ()
Install /boot/boot.cfg with EFI bootloaders.

On ARM ports, the EFI boot loader handles a boot.cfg file if it
exists, but one is not installed by default.  In contrast, both the
i386 and amd64 ports do install boot.cfg by default.  Bring these
ports into agreement by installing boot.cfg on ARM ports with EFI boot
loaders.


(brook)
diff -r1.45 -r1.46 src/distrib/utils/embedded/conf/armv7.conf
diff -r0 -r1.1 src/distrib/utils/embedded/files/boot.cfg
cvs diff -r1.45 -r1.46 src/distrib/utils/embedded/conf/armv7.conf (expand / switch to unified diff)

--- src/distrib/utils/embedded/conf/armv7.conf 2022/11/19 09:19:27 1.45
+++ src/distrib/utils/embedded/conf/armv7.conf 2023/04/19 18:39:18 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: armv7.conf,v 1.45 2022/11/19 09:19:27 yamt Exp $ 1# $NetBSD: armv7.conf,v 1.46 2023/04/19 18:39:18 brook Exp $
2# ARMv7 customization script used by mkimage 2# ARMv7 customization script used by mkimage
3# 3#
4board=armv7 4board=armv7
5console=fb 5console=fb
6resize=true 6resize=true
7 7
8. ${DIR}/conf/evbarm.conf 8. ${DIR}/conf/evbarm.conf
9 9
10kernels_generic="GENERIC" 10kernels_generic="GENERIC"
11 11
12make_label() { 12make_label() {
13 make_label_evbarm 13 make_label_evbarm
14} 14}
@@ -28,26 +28,27 @@ EOF @@ -28,26 +28,27 @@ EOF
28 28
29populate_common() { 29populate_common() {
30 if [ -f "${release}/usr/mdec/bootarm.efi" ]; then 30 if [ -f "${release}/usr/mdec/bootarm.efi" ]; then
31 # Install EFI bootloader 31 # Install EFI bootloader
32 mkdir -p "${mnt}/boot/EFI/BOOT" 32 mkdir -p "${mnt}/boot/EFI/BOOT"
33 cp "${release}/usr/mdec/bootarm.efi" "${mnt}/boot/EFI/BOOT/bootarm.efi" 33 cp "${release}/usr/mdec/bootarm.efi" "${mnt}/boot/EFI/BOOT/bootarm.efi"
34 34
35 # Install GENERIC kernel to root of the FFS partition 35 # Install GENERIC kernel to root of the FFS partition
36 ${GZIP_CMD} -dc ${kernel}/netbsd-${kernels_generic}.gz > "${mnt}/netbsd" 36 ${GZIP_CMD} -dc ${kernel}/netbsd-${kernels_generic}.gz > "${mnt}/netbsd"
37 echo "./netbsd type=file uname=root gname=wheel mode=0755" \ 37 echo "./netbsd type=file uname=root gname=wheel mode=0755" \
38 >> "$tmp/selected_sets" 38 >> "$tmp/selected_sets"
39 39
40 cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd 40 cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd
 41 cp ${DIR}/files/boot.cfg ${mnt}/boot/boot.cfg
41 else 42 else
42 # Fallback to non-EFI boot command 43 # Fallback to non-EFI boot command
43 cp ${DIR}/files/armv7_boot_nonefi.cmd ${mnt}/boot/boot.cmd 44 cp ${DIR}/files/armv7_boot_nonefi.cmd ${mnt}/boot/boot.cmd
44 fi 45 fi
45 46
46 # Install boot script 47 # Install boot script
47 "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr" 48 "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
48} 49}
49 50
50populate_rpi() { 51populate_rpi() {
51 firmwaredir="${src}/external/broadcom/rpi-firmware/dist" 52 firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
52 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf" 53 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
53 54
File Added: src/distrib/utils/embedded/files/boot.cfg
menu=Boot normally:rndseed /var/db/entropy-file;boot
menu=Boot single user:rndseed /var/db/entropy-file;boot -s
menu=Drop to boot prompt:prompt
default=1
timeout=5
clear=1