Module Name: src
Committed By: jmcneill
Date: Sun Feb 23 10:56:03 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
RPi4 has a different root device, so use config.txt conditionals to load
an alternate cmdline txt file (cmdline-pi4.txt) on these boards.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/embedded/conf/arm64.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/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.8 src/distrib/utils/embedded/conf/arm64.conf:1.9
--- src/distrib/utils/embedded/conf/arm64.conf:1.8 Mon Dec 16 11:00:30 2019
+++ src/distrib/utils/embedded/conf/arm64.conf Sun Feb 23 10:56:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.8 2019/12/16 11:00:30 skrll Exp $
+# $NetBSD: arm64.conf,v 1.9 2020/02/23 10:56:03 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -73,6 +73,10 @@ populate_rpi() {
root=ld0a console=${console}
EOF
+ cat > "${mnt}/boot/cmdline-pi4.txt" << EOF
+root=ld1a console=${console}
+EOF
+
cat > "${mnt}/boot/config.txt" << EOF
#
upstream_kernel=1
@@ -82,6 +86,11 @@ kernel=netbsd.img
kernel_address=0x200000
enable_uart=1
force_turbo=0
+#
+[pi4]
+cmdline=cmdline-pi4.txt
+#
+[all]
EOF
echo "${bar} installing firmware files ${bar}"
