Wed Jan 1 14:16:51 2020 UTC ()
upstream_kernel=1 is required with new firmware/kernel.


(skrll)
diff -r1.12 -r1.13 src/distrib/utils/embedded/conf/rpi_inst.conf
cvs diff -r1.12 -r1.13 src/distrib/utils/embedded/conf/rpi_inst.conf (expand / switch to unified diff)

--- src/distrib/utils/embedded/conf/rpi_inst.conf 2019/12/16 11:00:30 1.12
+++ src/distrib/utils/embedded/conf/rpi_inst.conf 2020/01/01 14:16:51 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rpi_inst.conf,v 1.12 2019/12/16 11:00:30 skrll Exp $ 1# $NetBSD: rpi_inst.conf,v 1.13 2020/01/01 14:16:51 skrll Exp $
2# Raspberry Pi customization script used by mkimage 2# Raspberry Pi customization script used by mkimage
3# 3#
4 4
5board=rpi_inst 5board=rpi_inst
6kerneldir=${KERNOBJDIR}/RPI_INSTALL 6kerneldir=${KERNOBJDIR}/RPI_INSTALL
7kernel=$kerneldir/netbsd-RPI_INSTALL.img 7kernel=$kerneldir/netbsd-RPI_INSTALL.img
8 8
9. ${DIR}/conf/evbarm.conf 9. ${DIR}/conf/evbarm.conf
10 10
11image=$HOME/${board}.img 11image=$HOME/${board}.img
12 12
13swap=8 13swap=8
14extra=8 # spare space 14extra=8 # spare space
@@ -76,26 +76,28 @@ make_fstab() { @@ -76,26 +76,28 @@ make_fstab() {
76 76
77firmwaredir=$src/external/broadcom/rpi-firmware/dist 77firmwaredir=$src/external/broadcom/rpi-firmware/dist
78firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf" 78firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
79dtbs="$(${MAKE} -C ${kerneldir} -v DTB)" 79dtbs="$(${MAKE} -C ${kerneldir} -v DTB)"
80 80
81populate() { 81populate() {
82 cat > ${mnt}/boot/cmdline.txt << EOF 82 cat > ${mnt}/boot/cmdline.txt << EOF
83root=ld0a console=fb 83root=ld0a console=fb
84#fb=1280x1024 # to select a mode, otherwise try EDID  84#fb=1280x1024 # to select a mode, otherwise try EDID
85#fb=disable # to disable fb completely 85#fb=disable # to disable fb completely
86EOF 86EOF
87 87
88 cat > ${mnt}/boot/config.txt << EOF 88 cat > ${mnt}/boot/config.txt << EOF
 89#
 90upstream_kernel=1
89# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md 91# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
90enable_uart=1  92enable_uart=1
91force_turbo=0 93force_turbo=0
92EOF 94EOF
93 95
94 if [ ! -f ${kernel} ]; then 96 if [ ! -f ${kernel} ]; then
95 echo ${PROG}: Missing ${kernel} 1>&2 97 echo ${PROG}: Missing ${kernel} 1>&2
96 exit 1 98 exit 1
97 fi 99 fi
98 100
99 echo "${bar} installing kernel ${bar}" 101 echo "${bar} installing kernel ${bar}"
100 case ${kernel} in 102 case ${kernel} in
101 *.gz) 103 *.gz)