[src/trunk]: src/distrib/utils/embedded/conf Move back to MBR based images fo...

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

details:   https://anonhg.NetBSD.org/src/rev/c9b6e88e4990
branches:  trunk
changeset: 1010532:c9b6e88e4990
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed May 27 21:53:04 2020 +0000

description:
Move back to MBR based images for armv7 because Amlogic's bootloader (for
Amlogic S805 based boards) needs to be installed to sector 1, which
conflicts with the GPT header.

diffstat:

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

diffs (28 lines):

diff -r 1711a5df40f9 -r c9b6e88e4990 distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf    Wed May 27 20:49:14 2020 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf    Wed May 27 21:53:04 2020 +0000
@@ -1,14 +1,9 @@
-# $NetBSD: armv7.conf,v 1.43 2020/05/25 11:11:52 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.44 2020/05/27 21:53:04 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
 
@@ -59,7 +54,7 @@
        # The GENERIC .img kernel img is used for RPI2
        if [ -f "${mnt}/boot/netbsd-GENERIC.img" ]; then
                cat > "${mnt}/boot/cmdline.txt" << EOF
-root=NAME=${gpt_label_ffs} console=${console}
+root=ld0a console=${console}
 #fb=1280x1024          # to select a mode, otherwise try EDID
 #fb=disable            # to disable fb completely
 EOF