From 009e76db36120b913d1afa7a98f47fd02456ef99 Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Sun, 29 May 2016 07:38:01 +0000
Subject: [PATCH] Stop building u-boot kernel and ramdisk images.  The kernel
 make targets are left for now but umg files are no longer built when building
 releases.

---
 src/etc/etc.armv7/Makefile.inc | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/etc/etc.armv7/Makefile.inc b/src/etc/etc.armv7/Makefile.inc
index 2b48a22b..64f38672 100644
--- a/src/etc/etc.armv7/Makefile.inc
+++ b/src/etc/etc.armv7/Makefile.inc
@@ -1,33 +1,10 @@
-#	$OpenBSD: Makefile.inc,v 1.13 2016/05/23 02:19:46 jsg Exp $
-
-ALLSOC=EXYNOS IMX OMAP SUNXI VEXPRESSA9 VEXPRESSA15
-MDEXT=		bsd.rd BOOTARM.EFI
-
-.for SOC in ${ALLSOC}
-MDEXT+=		bsd.${SOC}.umg
-MDEXT+=		bsd.rd.${SOC}.umg
-.endfor
-
-KERNADDR_OMAP=0x80300000
-KERNADDR_IMX=0x10300000
-KERNADDR_SUNXI=0x40300000
-KERNADDR_VEXPRESSA15=0x80300000
-KERNADDR_VEXPRESSA9=0x60300000
-KERNADDR_EXYNOS=0x40300000
+#	$OpenBSD: Makefile.inc,v 1.14 2016/05/29 07:38:01 jsg Exp $
 
 bootblocks:
 	cp ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR}
 
-kernels: bootblocks ${ALL_KERNELS}
-.for CONF K in ${KERNELS}
-	cp ../sys/arch/${MACHINE}/compile/${CONF}/bsd ${RELEASEDIR}/$K
-.for SOC in ${ALLSOC}
-	mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
-	    ${RELEASEDIR}/$K ${RELEASEDIR}/$K.${SOC}.umg
-.endfor
-.endfor
-
-MDEXT+=	miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \
+MDEXT=	bsd.rd BOOTARM.EFI \
+	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-wandboard-${OSrev}.fs