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.

3 files changed, 31 insertions, 99 deletions

diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile
index 4b6ff2fbb86..2c45c7c28d1 100644
--- a/distrib/armv7/ramdisk/Makefile
+++ b/distrib/armv7/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2016/05/21 07:19:24 jsg Exp $
+#	$OpenBSD: Makefile,v 1.13 2016/05/29 07:38:01 jsg Exp $
 
 REV=	${OSrev}
 
@@ -21,13 +21,6 @@ VND_RDEV=	/dev/r${VND}a
 VND_CRDEV=	/dev/r${VND}c
 PID!=		echo $$$$
 
-KERNADDR_OMAP=0x80300000
-KERNADDR_IMX=0x10300000
-KERNADDR_SUNXI=0x40300000
-KERNADDR_VEXPRESSA15=0x80300000
-KERNADDR_VEXPRESSA9=0x60300000
-KERNADDR_EXYNOS=0x40300000
-
 DISKTYPE=       rdroot
 NBLKS=		15360
 # minfree, opt, b/i  trks, sects, cpg
@@ -39,12 +32,8 @@ all ${IMAGE}:
 	@false
 .else
 
-ALLSOC=		EXYNOS IMX OMAP SUNXI VEXPRESSA9 VEXPRESSA15
 ALLBSD=		bsd
 ALLBSDRD=	${BSD_RD}
-.for SOC in ${ALLSOC}
-ALLBSDRD+=	${BSD_RD}.${SOC}.umg
-.endfor
 all:	${ALLBSDRD}
 
 bsd:
@@ -57,12 +46,6 @@ ${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
 	cp bsd ${BSD_RD}
 	${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
 
-.for SOC in ${ALLSOC}
-${BSD_RD}.${SOC}.umg: ${BSD_RD}
-	mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
-	    ${BSD_RD} ${BSD_RD}.${SOC}.umg
-.endfor
-
 ${IMAGE}: rd_setup do_files rd_teardown
 
 .endif
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 1df9575eb72..c7e6588d006 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.33 2016/05/28 10:10:36 jsg Exp $
+#	$OpenBSD: install.md,v 1.34 2016/05/29 07:38:01 jsg Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -32,32 +32,8 @@
 # machine dependent section of installation/upgrade script.
 #
 
-# This code runs when the script is initally sourced to set up 
-# MDSETS, SANESETS and DEFAULTSETS 
-
-if dmesg | grep -q '^omap0 at mainbus0:'; then
-        MDPLAT=OMAP
-fi
-
-if dmesg | grep -q '^imx0 at mainbus0:'; then
-        MDPLAT=IMX
-fi
-
-if dmesg | grep -q '^sunxi0 at mainbus0:'; then
-	MDPLAT=SUNXI
-fi
-
-if dmesg | grep -q '^vexpress0 at mainbus0:'; then
-	if dmesg | grep -q '^cpu0 at mainbus0: ARM Cortex A9 '; then
-		MDPLAT=VEXPRESSA9
-	else
-		MDPLAT=VEXPRESSA15
-	fi
-fi
-
-MDSETS="bsd.${MDPLAT}.umg bsd.rd.${MDPLAT}.umg"
 SANESETS="bsd"
-DEFAULTSETS="bsd bsd.rd ${MDSETS}"
+DEFAULTSETS="bsd bsd.rd"
 
 NEWFSARGS_msdos="-F 16 -L boot"
 MOUNT_ARGS_msdos="-o-l"
@@ -72,6 +48,7 @@ md_installboot() {
 	CUBOX=$(scan_dmesg '/^imx0 at mainbus0: \(SolidRun.*\)/s//CUBOX/p')
 	NITROGEN=$(scan_dmesg '/^imx0 at mainbus0: \(Freescale i.MX6 SABRE Lite.*\)/s//NITROGEN/p')
 	WANDBOARD=$(scan_dmesg '/^imx0 at mainbus0: \(Wandboard i.MX6.*\)/s//WANDBOARD/p')
+	CUBIE=$(scan_dmesg '/^mainbus0 at root: Cubietech \(Cubieboard\)/s//CUBIEBOARD/p')
 
 	mount ${mount_args} /dev/${_disk}i /mnt/mnt
 
@@ -81,35 +58,30 @@ md_installboot() {
 	mkdir -p /mnt/mnt/efi/boot
 	cp /mnt/usr/mdec/BOOTARM.EFI /mnt/mnt/efi/boot/bootarm.efi
 
-	if [[ ${MDPLAT} == "OMAP" ]]; then
-
-		if [[ -n $BEAGLE ]]; then
-			cp /mnt/usr/mdec/beagle/{MLO,u-boot.img} /mnt/mnt/
-			cp /mnt/usr/mdec/beagle/*.dtb /mnt/mnt/
-		elif [[ -n $BEAGLEBONE ]]; then
-			cp /mnt/usr/mdec/am335x/{MLO,u-boot.img} /mnt/mnt/
-			cp /mnt/usr/mdec/am335x/*.dtb /mnt/mnt/
-		elif [[ -n $PANDA ]]; then
-			cp /mnt/usr/mdec/panda/{MLO,u-boot.img} /mnt/mnt/
-			cp /mnt/usr/mdec/panda/*.dtb /mnt/mnt/
-		fi
-	elif [[ ${MDPLAT} == "IMX" ]]; then
-		if [[ -n $CUBOX ]]; then
-			cp /mnt/usr/mdec/cubox/*.dtb /mnt/mnt/
-			dd if=/mnt/usr/mdec/cubox/SPL \
-			    of=/dev/${_disk}c bs=1024 seek=1 >/dev/null
-			dd if=/mnt/usr/mdec/cubox/u-boot.img \
-			    of=/dev/${_disk}c bs=1024 seek=69 >/dev/null
-		elif [[ -n $NITROGEN ]]; then
-			cp /mnt/usr/mdec/nitrogen/*.dtb /mnt/mnt/
-		elif [[ -n $WANDBOARD ]]; then
-			cp /mnt/usr/mdec/wandboard/*.dtb /mnt/mnt/
-			dd if=/mnt/usr/mdec/wandboard/SPL \
-			    of=/dev/${_disk}c bs=1024 seek=1 >/dev/null
-			dd if=/mnt/usr/mdec/wandboard/u-boot.img \
-			    of=/dev/${_disk}c bs=1024 seek=69 >/dev/null
-		fi
-	elif [[ ${MDPLAT} == "SUNXI" ]]; then
+	if [[ -n $BEAGLE ]]; then
+		cp /mnt/usr/mdec/beagle/{MLO,u-boot.img} /mnt/mnt/
+		cp /mnt/usr/mdec/beagle/*.dtb /mnt/mnt/
+	elif [[ -n $BEAGLEBONE ]]; then
+		cp /mnt/usr/mdec/am335x/{MLO,u-boot.img} /mnt/mnt/
+		cp /mnt/usr/mdec/am335x/*.dtb /mnt/mnt/
+	elif [[ -n $PANDA ]]; then
+		cp /mnt/usr/mdec/panda/{MLO,u-boot.img} /mnt/mnt/
+		cp /mnt/usr/mdec/panda/*.dtb /mnt/mnt/
+	elif [[ -n $CUBOX ]]; then
+		cp /mnt/usr/mdec/cubox/*.dtb /mnt/mnt/
+		dd if=/mnt/usr/mdec/cubox/SPL \
+		    of=/dev/${_disk}c bs=1024 seek=1 >/dev/null
+		dd if=/mnt/usr/mdec/cubox/u-boot.img \
+		    of=/dev/${_disk}c bs=1024 seek=69 >/dev/null
+	elif [[ -n $NITROGEN ]]; then
+		cp /mnt/usr/mdec/nitrogen/*.dtb /mnt/mnt/
+	elif [[ -n $WANDBOARD ]]; then
+		cp /mnt/usr/mdec/wandboard/*.dtb /mnt/mnt/
+		dd if=/mnt/usr/mdec/wandboard/SPL \
+		    of=/dev/${_disk}c bs=1024 seek=1 >/dev/null
+		dd if=/mnt/usr/mdec/wandboard/u-boot.img \
+		    of=/dev/${_disk}c bs=1024 seek=69 >/dev/null
+	elif [[ -n $CUBIE ]]; then
 		cp /mnt/usr/mdec/cubie/u-boot-sunxi-with-spl.bin /mnt/mnt/
 		cp /mnt/usr/mdec/cubie/*.dtb /mnt/mnt/
 	fi
diff --git a/etc/etc.armv7/Makefile.inc b/etc/etc.armv7/Makefile.inc
index 2b48a22b5e9..64f3867298c 100644
--- a/etc/etc.armv7/Makefile.inc
+++ b/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