Module Name:    src
Committed By:   jmcneill
Date:           Wed May 27 10:56:59 UTC 2020

Modified Files:
        src/distrib/utils/embedded/conf: rpi.conf

Log Message:
Conditionally boot kernel.img or kernel7.img depending on board


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/embedded/conf/rpi.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.36 src/distrib/utils/embedded/conf/rpi.conf:1.37
--- src/distrib/utils/embedded/conf/rpi.conf:1.36	Mon May 18 21:19:34 2020
+++ src/distrib/utils/embedded/conf/rpi.conf	Wed May 27 10:56:59 2020
@@ -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 @@ EOF
 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}"

Reply via email to