From 442e9229aa524928fb21564532177361239a4f93 Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Sat, 1 Aug 2015 00:15:37 +0000
Subject: [PATCH] Make use of u-boot 2015.07's unified wandboard config to
 provide a miniroot to cover all current wandboard variations.

Unlike the other imx u-boot configs the wandboard config doesn't search
for ext2 only a fat fs.

Grow the ramdisk size to fit the extra u-boot files.

From Roman Kravchuk.
---
 src/etc/etc.armv7/Makefile.inc | 5 +++--
 src/etc/etc.armv7/disktab      | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/etc/etc.armv7/Makefile.inc b/src/etc/etc.armv7/Makefile.inc
index f27840ff..f66591dc 100644
--- a/src/etc/etc.armv7/Makefile.inc
+++ b/src/etc/etc.armv7/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.11 2015/07/17 17:02:52 jsg Exp $
+#	$OpenBSD: Makefile.inc,v 1.12 2015/08/01 00:15:37 jsg Exp $
 
 ALLSOC=EXYNOS IMX OMAP SUNXI VEXPRESSA9 VEXPRESSA15
 MDEXT=		bsd.rd
@@ -28,4 +28,5 @@ kernels: bootblocks ${ALL_KERNELS}
 
 MDEXT+=	miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \
 	miniroot-cubie-${OSrev}.fs miniroot-cubox-${OSrev}.fs \
-	miniroot-nitrogen-${OSrev}.fs miniroot-panda-${OSrev}.fs
+	miniroot-nitrogen-${OSrev}.fs miniroot-panda-${OSrev}.fs \
+	miniroot-wandboard-${OSrev}.fs
diff --git a/src/etc/etc.armv7/disktab b/src/etc/etc.armv7/disktab
index f96ad40a..025b4bf8 100644
--- a/src/etc/etc.armv7/disktab
+++ b/src/etc/etc.armv7/disktab
@@ -1,10 +1,10 @@
-# $OpenBSD: disktab,v 1.1 2013/09/04 16:53:40 patrick Exp $
+# $OpenBSD: disktab,v 1.2 2015/08/01 00:15:37 jsg Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
-	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
-	:ob#0:pb#0:oc#0:pc#8192:
+	:ty=simulated:se#512:nc#16:nt#2:ns#320:\
+	:ta=4.2BSD:oa#0:pa#10240:fa#512:ba#4096:\
+	:ob#0:pb#0:oc#0:pc#10240:
 
 
 rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\