[src/trunk]: src/distrib/utils/embedded/conf Enable GPT support w/ hybrid MBR...

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

details:   https://anonhg.NetBSD.org/src/rev/cb4e2c7bba0b
branches:  trunk
changeset: 933321:cb4e2c7bba0b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun May 24 18:44:46 2020 +0000

description:
Enable GPT support w/ hybrid MBR for Raspberry Pi compatibility.

diffstat:

 distrib/utils/embedded/conf/arm64.conf |  18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diffs (44 lines):

diff -r 2cbbeb79fa44 -r cb4e2c7bba0b distrib/utils/embedded/conf/arm64.conf
--- a/distrib/utils/embedded/conf/arm64.conf    Sun May 24 18:43:39 2020 +0000
+++ b/distrib/utils/embedded/conf/arm64.conf    Sun May 24 18:44:46 2020 +0000
@@ -1,9 +1,14 @@
-# $NetBSD: arm64.conf,v 1.10 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.11 2020/05/24 18:44:46 jmcneill Exp $
 # ARM64 customization script used by mkimage
 #
 board=arm64
 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
 
@@ -52,11 +57,7 @@
        firmwarefiles="LICENCE.broadcom bootcode.bin fixup4cd.dat fixup4.dat fixup_cd.dat fixup.dat start4cd.elf start4.elf start_cd.elf start.elf"
 
        cat > "${mnt}/boot/cmdline.txt" << EOF
-root=ld0a console=${console}
-EOF
-
-       cat > "${mnt}/boot/cmdline-pi4.txt" << EOF
-root=ld1a console=${console}
+root=NAME=${gpt_label_ffs} console=${console}
 EOF
 
        cat > "${mnt}/boot/config.txt" << EOF
@@ -70,11 +71,6 @@
 kernel_address=0x200000
 enable_uart=1
 force_turbo=0
-#
-[pi4]
-cmdline=../../cmdline-pi4.txt
-#
-[all]
 EOF
 
        echo "${bar} installing firmware files ${bar}"