From 72eec17dafc26b7ae2d047abedfdf85399846d18 Mon Sep 17 00:00:00 2001
From: patrick <>
Date: Mon, 28 Oct 2013 14:10:41 +0000
Subject: [PATCH] Revamp ARMv7 ramdisk and miniroot creation process.

Instead of running mkuboot during install, we call it on during
the release build, so that we can also ship bootable images
of the generic and the ramdisk kernel.

We can now build miniroots for imx, too.  The installer also
can recognize the SoC and makes decision based on it.

Use ext2fs for i.MX6 based devices.

Tar the bootloader files to save some space.

ok syl@
---
 src/etc/etc.armv7/Makefile.inc | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/etc/etc.armv7/Makefile.inc b/src/etc/etc.armv7/Makefile.inc
index 83440c95..92587e02 100644
--- a/src/etc/etc.armv7/Makefile.inc
+++ b/src/etc/etc.armv7/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.2 2013/09/07 23:04:44 patrick Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 2013/10/28 14:10:41 patrick Exp $
 
 ALLSOC=IMX OMAP
 KERNELS=
@@ -6,9 +6,35 @@ MDEXT=
 
 .for SOC in ${ALLSOC}
 KERNELS+=	GENERIC-${SOC} bsd.${SOC}
+MDEXT+=		bsd.${SOC}.umg
 MDEXT+=		bsd.rd.${SOC}
+MDEXT+=		bsd.rd.${SOC}.umg
 .endfor
 
+KERNADDR_OMAP=0x80300000
+KERNADDR_IMX=0x10800000
+
+.for CONF K in ${KERNELS}
+.  if !target($K)
+$K:
+	cd ../sys/arch/${MACHINE}/conf && config ${CONF}
+	cd ../sys/arch/${MACHINE}/compile/${CONF} && \
+	    ${MAKE} clean && exec ${MAKE}
+.  endif
+ALL_KERNELS += $K
+.endfor
+
+kernels: bootblocks ${ALL_KERNELS}
+.for CONF K in ${KERNELS}
+	cp ../sys/arch/${MACHINE}/compile/${CONF}/bsd ${RELEASEDIR}/$K
+.endfor
+.for SOC in ${ALLSOC}
+	mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
+	    ${RELEASEDIR}/bsd.${SOC} ${RELEASEDIR}/bsd.${SOC}.umg
+.endfor
+
+ALL_KERNELS=
+
 bootblocks:
 
 MDEXT+=	miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \