Module Name: src
Committed By: jmcneill
Date: Mon May 25 11:06:49 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Switch to GPT w/ hybrid MBR for armv7 images
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/utils/embedded/conf/armv7.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/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.41 src/distrib/utils/embedded/conf/armv7.conf:1.42
--- src/distrib/utils/embedded/conf/armv7.conf:1.41 Mon May 18 21:19:34 2020
+++ src/distrib/utils/embedded/conf/armv7.conf Mon May 25 11:06:49 2020
@@ -1,9 +1,14 @@
-# $NetBSD: armv7.conf,v 1.41 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.42 2020/05/25 11:06:49 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
console=fb
resize=true
+gpt=true
+gpt_hybrid=true
+gpt_create_flags="-p 16"
+gpt_label_efi="EFI"
+gpt_label_ffs="netbsd-root"
. ${DIR}/conf/evbarm.conf
@@ -57,7 +62,7 @@ populate_rpi() {
mv "${mnt}/boot/netbsd-GENERIC.img" "${mnt}/boot/kernel7.img"
cat > "${mnt}/boot/cmdline.txt" << EOF
-root=ld0a console=${console}
+root=NAME=${gpt_label_ffs} console=${console}
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
