From aec3f0cda855e3bd52cb4dcf7664b619458505f6 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@NetBSD.org>
Date: Wed, 27 May 2020 21:53:04 +0000
Subject: [PATCH] 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.

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

diff --git a/distrib/utils/embedded/conf/armv7.conf b/distrib/utils/embedded/conf/armv7.conf
index 7af5ea7ba03c..05940ea95451 100644
--- a/distrib/utils/embedded/conf/armv7.conf
+++ b/distrib/utils/embedded/conf/armv7.conf
@@ -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 @@ populate_rpi() {
 	# 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