[src/trunk]: src/distrib/utils/embedded/conf Conditionally boot kernel.img or...

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

details:   https://anonhg.NetBSD.org/src/rev/c891df5122a0
branches:  trunk
changeset: 933565:c891df5122a0
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed May 27 10:56:59 2020 +0000

description:
Conditionally boot kernel.img or kernel7.img depending on board

diffstat:

 distrib/utils/embedded/conf/rpi.conf |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 74afaf003e68 -r c891df5122a0 distrib/utils/embedded/conf/rpi.conf
--- a/distrib/utils/embedded/conf/rpi.conf      Wed May 27 10:53:18 2020 +0000
+++ b/distrib/utils/embedded/conf/rpi.conf      Wed May 27 10:56:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.36 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.37 2020/05/27 10:56:59 jmcneill Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -60,10 +60,15 @@
 upstream_kernel=1
 os_prefix=dtb/
 cmdline=../cmdline.txt
-kernel=/kernel.img
 # UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
 enable_uart=1
 force_turbo=0
+[pi0]
+kernel=/kernel.img
+[pi1]
+kernel=/kernel.img
+[all]
+kernel=/kernel7.img
 EOF
 
        echo "${bar} kernel ${kernel} ${bar}"