Remove the miniroot for the OMAP3 BeagleBoards. Ethernet is on USB and

USB isn't supported.  The installer turns out to have been broken on
BeagleBoard for over a year and no one noticed.  The existing support
for OMAP3 in the kernel remains though it isn't clear if anyone has
tried it after the fdt changes went in.

ok patrick@ tom@ kettenis@ matthieu@

8 files changed, 12 insertions, 33 deletions

diff --git a/distrib/armv7/miniroot/Makefile b/distrib/armv7/miniroot/Makefile
index 6ae6db77b13..be9f3615cef 100644
--- a/distrib/armv7/miniroot/Makefile
+++ b/distrib/armv7/miniroot/Makefile
@@ -1,3 +1,3 @@
-SUBDIR= am335x beagle cubie cubox nitrogen panda wandboard
+SUBDIR= am335x cubie cubox nitrogen panda wandboard
 
 .include <bsd.subdir.mk>
diff --git a/distrib/armv7/miniroot/beagle/Makefile b/distrib/armv7/miniroot/beagle/Makefile
deleted file mode 100644
index 67a9fe9acdb..00000000000
--- a/distrib/armv7/miniroot/beagle/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-BOARD=	beagle
-PLATFORM=OMAP
-UBOOT=	omap3_beagle
-DTBS=\
-	omap3-beagle-xm-ab.dtb \
-	omap3-beagle-xm.dtb \
-	omap3-beagle.dtb
-
-.include "${.CURDIR}/../Makefile.inc"
diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile
index 5887f7dd87e..8a31c944c19 100644
--- a/distrib/armv7/ramdisk/Makefile
+++ b/distrib/armv7/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2016/11/30 15:46:45 natano Exp $
+#	$OpenBSD: Makefile,v 1.17 2017/09/01 04:40:40 jsg Exp $
 
 REV=	${OSrev}
 
@@ -19,7 +19,6 @@ MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=4096
 
 DIRS=\
 	am335x \
-	beagle \
 	cubie \
 	cubox \
 	nitrogen \
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 2b3390a2aeb..23d574e4e7a 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.47 2017/08/22 23:27:52 jsg Exp $
+#	$OpenBSD: install.md,v 1.48 2017/09/01 04:40:40 jsg Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,6 @@ md_installboot() {
 
 	case $(sysctl -n hw.product) in
 	*AM335x*)			_plat=am335x;;
-	*'OMAP3 BeagleBoard'*)		_plat=beagle;;
 	*OMAP4*)			_plat=panda;;
 	*'Cubietech Cubieboard2'*)	_plat=cubie;;
 	*Cubox-i*|*HummingBoard*)	_plat=cubox;;
@@ -56,7 +55,7 @@ md_installboot() {
 	_mdec=/usr/mdec/$_plat
 
 	case $_plat in
-	am335x|beagle|panda)
+	am335x|panda)
 		cp $_mdec/{MLO,u-boot.img,*.dtb} /mnt/mnt/
 		;;
 	cubox|wandboard)
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index c5e0ad5b0d9..d9d9f833bc0 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.30 2017/07/08 15:42:46 florian Exp $
+#	$OpenBSD: list,v 1.31 2017/09/01 04:40:40 jsg Exp $
 
 SRCDIRS distrib/special
 
@@ -127,12 +127,6 @@ COPY	/usr/local/share/dtb/arm/am335x-bonegreen.dtb	usr/mdec/am335x/am335x-bonegr
 COPY	/usr/local/share/dtb/arm/am335x-evm.dtb		usr/mdec/am335x/am335x-evm.dtb
 COPY	/usr/local/share/dtb/arm/am335x-evmsk.dtb	usr/mdec/am335x/am335x-evmsk.dtb
 
-COPY	/usr/local/share/u-boot/omap3_beagle/MLO	usr/mdec/beagle/MLO
-COPY	/usr/local/share/u-boot/omap3_beagle/u-boot.img	usr/mdec/beagle/u-boot.img
-COPY	/usr/local/share/dtb/arm/omap3-beagle-xm-ab.dtb	usr/mdec/beagle/omap3-beagle-xm-ab.dtb
-COPY	/usr/local/share/dtb/arm/omap3-beagle-xm.dtb	usr/mdec/beagle/omap3-beagle-xm.dtb
-COPY	/usr/local/share/dtb/arm/omap3-beagle.dtb	usr/mdec/beagle/omap3-beagle.dtb
-
 COPY	/usr/local/share/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin	usr/mdec/cubie/u-boot-sunxi-with-spl.bin
 COPY	/usr/local/share/dtb/arm/sun7i-a20-cubieboard2.dtb	usr/mdec/cubie/sun7i-a20-cubieboard2.dtb
 
diff --git a/distrib/notes/armv7/contents b/distrib/notes/armv7/contents
index 75bfa9c3738..606b17485eb 100644
--- a/distrib/notes/armv7/contents
+++ b/distrib/notes/armv7/contents
@@ -1,14 +1,10 @@
-dnl	$OpenBSD: contents,v 1.11 2016/09/04 10:06:11 jsg Exp $
+dnl	$OpenBSD: contents,v 1.12 2017/09/01 04:40:40 jsg Exp $
 TopPart
 
 	miniroot-am335x-{:--:}OSrev.fs
 			A miniroot filesystem to be used for
 			installation; BeagleBone version.
 
-	miniroot-beagle-{:--:}OSrev.fs
-			A miniroot filesystem to be used for
-			installation; BeagleBoard version.
-
 	miniroot-cubie-{:--:}OSrev.fs
 			A miniroot filesystem to be used for
 			installation; Cubieboard2 version.
diff --git a/distrib/notes/armv7/prep b/distrib/notes/armv7/prep
index 6dc4b512e4d..9dbbc9bc6a1 100644
--- a/distrib/notes/armv7/prep
+++ b/distrib/notes/armv7/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.15 2017/08/26 13:25:17 jsg Exp $
+dnl	$OpenBSD: prep,v 1.16 2017/09/01 04:40:40 jsg Exp $
 Please be aware that OpenBSD support for this platform is far from
 complete.
 
@@ -26,9 +26,9 @@ Booting from an SD card:
   
   Use the dd(1) utility to copy the miniroot to the hard drive.
   The command would likely be, under OpenBSD:
-  	dd if=miniroot-beagle-{:--:}OSrev.fs of=/dev/rsd1c
+  	dd if=miniroot-am335x-{:--:}OSrev.fs of=/dev/rsd1c
   
-  When you have connected the BeagleBoard to you computer, a command such
+  When you have connected the BeagleBone to your computer, a command such
   as "cu -l cuaU0 -s 115200" (assuming cuaU0 is your serial port device)
   should connect you to the board's console.
   
@@ -61,7 +61,7 @@ Install on systems without a supported miniroot:
   To do so first install the u-boot-arm and dtb packages.  Write one of the
   provided miniroot images to an SD card:
 
- 	dd if=miniroot-beagle-{:--:}OSrev.fs of=/dev/rsdXc
+ 	dd if=miniroot-am335x-{:--:}OSrev.fs of=/dev/rsdXc
 
   Add a board specific DTB file:
 
diff --git a/etc/etc.armv7/Makefile.inc b/etc/etc.armv7/Makefile.inc
index 18a4447db1d..b43edd42386 100644
--- a/etc/etc.armv7/Makefile.inc
+++ b/etc/etc.armv7/Makefile.inc
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile.inc,v 1.15 2017/04/04 00:03:12 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.16 2017/09/01 04:40:40 jsg Exp $
 
 bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR}
 
 MDEXT=	bsd.rd BOOTARM.EFI \
-	miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \
+	miniroot-am335x-${OSrev}.fs \
 	miniroot-cubie-${OSrev}.fs miniroot-cubox-${OSrev}.fs \
 	miniroot-nitrogen-${OSrev}.fs miniroot-panda-${OSrev}.fs \
 	miniroot-wandboard-${OSrev}.fs