From: deraadt <deraadt@openbsd.org>
Date: Tue, 12 Oct 2021 16:39:22 +0000 (+0000)
Subject: make armv7 fit again after bootblock growth; discussed with jsg
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1f810a07c28c1883b45d216bb64b440657c5d7b8;p=openbsd

make armv7 fit again after bootblock growth; discussed with jsg
---

diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 84d75484f0d..bb00f4360a8 100644
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile.inc,v 1.27 2020/05/18 06:20:43 otto Exp $
+#	$OpenBSD: Makefile.inc,v 1.28 2021/10/12 16:39:22 deraadt Exp $
 
 FS=		miniroot-${BOARD}-${OSrev}.img
-FSSIZE=		67584	# ffs+msdos, actually
+FSSIZE=		71424	# ffs+msdos, actually
 MOUNT_POINT=	/mnt
 
 MKUBOOT?=	mkuboot
 
 DISKTYPE=	miniroot
 MSDOSSTART=	32768
-MSDOSSIZE=	4096
+MSDOSSIZE=	8192
 FFSSTART!=	expr ${MSDOSSTART} + ${MSDOSSIZE}
 
 PDTB=		/usr/local/share/dtb/arm
@@ -47,6 +47,7 @@ ${FS}: bsd.rd
 
 	mkdir -p ${MOUNT_POINT}/efi/boot
 	cp /usr/mdec/BOOTARM.EFI ${MOUNT_POINT}/efi/boot/bootarm.efi
+	df ${MOUNT_POINT}
 	umount ${MOUNT_POINT}
 
 	newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
diff --git a/etc/etc.armv7/disktab b/etc/etc.armv7/disktab
index 2e8bb8d432b..14ca79e3274 100644
--- a/etc/etc.armv7/disktab
+++ b/etc/etc.armv7/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.12 2021/10/09 01:01:07 deraadt Exp $
+# $OpenBSD: disktab,v 1.13 2021/10/12 16:39:22 deraadt Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -7,5 +7,5 @@ rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ob#0:pb#0:oc#0:pc#19200:
 
 miniroot:\
-	:dt=rdroot:se#512:nc#9:nt#16:ns#256:\
-	:oc#0:pc#36864:
+	:dt=rdroot:se#512:nc#9:nt#16:ns#496:\
+	:oc#0:pc#71424: