Beagle has been replaced by armv7.

23 files changed, 30 insertions, 30 deletions

diff --git a/distrib/Makefile b/distrib/Makefile
index 9e9c381576f..5c671be706b 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.42 2013/03/26 18:06:00 jasper Exp $
+#	$OpenBSD: Makefile,v 1.43 2013/09/04 20:00:21 patrick Exp $
 
 SUBDIR=	special notes
 
 .if	make(obj)
-SUBDIR+=alpha amd64 armish beagle hp300 hppa i386 landisk loongson luna88k \
+SUBDIR+=alpha amd64 armish armv7 hp300 hppa i386 landisk loongson luna88k \
 	macppc mvme68k mvme88k octeon sgi socppc sparc sparc64 vax zaurus
 .elif exists(${MACHINE})
 SUBDIR+=${MACHINE}
diff --git a/distrib/armv7/Makefile b/distrib/armv7/Makefile
new file mode 100644
index 00000000000..e1591413afe
--- /dev/null
+++ b/distrib/armv7/Makefile
@@ -0,0 +1,5 @@
+#	$OpenBSD: Makefile,v 1.1 2013/09/04 20:00:21 patrick Exp $
+
+SUBDIR= ramdisk miniroot
+
+.include <bsd.subdir.mk>
diff --git a/distrib/beagle/miniroot/Makefile b/distrib/armv7/miniroot/Makefile
index 98abfe080b5..98abfe080b5 100644
--- a/distrib/beagle/miniroot/Makefile
+++ b/distrib/armv7/miniroot/Makefile
diff --git a/distrib/beagle/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 6891d676239..6891d676239 100644
--- a/distrib/beagle/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
diff --git a/distrib/beagle/miniroot/am335x/Makefile b/distrib/armv7/miniroot/am335x/Makefile
index 58a8892a8c1..58a8892a8c1 100644
--- a/distrib/beagle/miniroot/am335x/Makefile
+++ b/distrib/armv7/miniroot/am335x/Makefile
diff --git a/distrib/beagle/miniroot/beagle/Makefile b/distrib/armv7/miniroot/beagle/Makefile
index eb3c36bdb58..eb3c36bdb58 100644
--- a/distrib/beagle/miniroot/beagle/Makefile
+++ b/distrib/armv7/miniroot/beagle/Makefile
diff --git a/distrib/beagle/miniroot/panda/Makefile b/distrib/armv7/miniroot/panda/Makefile
index a9626bfb717..a9626bfb717 100644
--- a/distrib/beagle/miniroot/panda/Makefile
+++ b/distrib/armv7/miniroot/panda/Makefile
diff --git a/distrib/beagle/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile
index ac2751e74a1..8c24783b823 100644
--- a/distrib/beagle/ramdisk/Makefile
+++ b/distrib/armv7/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2011/07/27 20:44:53 drahn Exp $
+#	$OpenBSD: Makefile,v 1.1 2013/09/04 20:00:22 patrick Exp $
 
 REV=	${OSrev}
 
@@ -45,10 +45,10 @@ ${IMAGE}: rd_setup do_files rd_teardown
 .endif
 
 bsd:
-	cd ${TOP}/../../sys/arch/beagle/conf && config RAMDISK
-	cd ${TOP}/../../sys/arch/beagle/compile/RAMDISK && \
+	cd ${TOP}/../../sys/arch/armv7/conf && config RAMDISK-OMAP
+	cd ${TOP}/../../sys/arch/armv7/compile/RAMDISK-OMAP && \
 	    ${MAKE} clean && exec ${MAKE}
-	cp ${TOP}/../../sys/arch/beagle/compile/RAMDISK/bsd bsd
+	cp ${TOP}/../../sys/arch/armv7/compile/RAMDISK-OMAP/bsd bsd
 
 rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
diff --git a/distrib/armv7/ramdisk/Makefile.inc b/distrib/armv7/ramdisk/Makefile.inc
new file mode 100644
index 00000000000..4b23e5f9958
--- /dev/null
+++ b/distrib/armv7/ramdisk/Makefile.inc
@@ -0,0 +1,4 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2013/09/04 20:00:23 patrick Exp $
+
+CRUNCHGENOPTS= -E
+
diff --git a/distrib/beagle/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index b6fb459c951..b335832f3f3 100644
--- a/distrib/beagle/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.8 2013/07/30 02:49:54 bmercer Exp $
+#	$OpenBSD: install.md,v 1.1 2013/09/04 20:00:23 patrick Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/distrib/beagle/ramdisk/list b/distrib/armv7/ramdisk/list
index 8944639c061..9f1c084b973 100644
--- a/distrib/beagle/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.2 2012/10/30 18:39:43 krw Exp $
+#	$OpenBSD: list,v 1.1 2013/09/04 20:00:23 patrick Exp $
 
 SRCDIRS distrib/special
 SRCDIRS bin sbin usr.bin usr.sbin
diff --git a/distrib/beagle/Makefile b/distrib/beagle/Makefile
deleted file mode 100644
index 7e4ca9ba886..00000000000
--- a/distrib/beagle/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2013/06/01 01:23:21 bmercer Exp $
-
-SUBDIR= ramdisk miniroot
-
-.include <bsd.subdir.mk>
diff --git a/distrib/beagle/ramdisk/Makefile.inc b/distrib/beagle/ramdisk/Makefile.inc
deleted file mode 100644
index 6d579c669d3..00000000000
--- a/distrib/beagle/ramdisk/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2011/03/14 16:40:23 drahn Exp $
-
-CRUNCHGENOPTS= -E
-
diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index fef91b2ba13..81959866dc6 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.39 2013/04/01 13:03:07 jasper Exp $
+#	$OpenBSD: Makefile,v 1.40 2013/09/04 20:00:26 patrick Exp $
 
 NOPROG=
 NOMAN=
@@ -18,7 +18,7 @@ all:	$(TARG)
 
 allarchs:
 	@cd $(.CURDIR); \
-	for arch in alpha amd64 armish aviion beagle hp300 hppa i386 landisk \
+	for arch in alpha amd64 armish armv7 aviion hp300 hppa i386 landisk \
 	    loongson luna88k macppc mvme68k mvme88k octeon sgi socppc \
 	    sparc sparc64 vax zaurus; \
 	do ${MAKE} M=$$arch; done
diff --git a/distrib/notes/beagle/contents b/distrib/notes/armv7/contents
index 2b6f3e20632..60aad918488 100644
--- a/distrib/notes/beagle/contents
+++ b/distrib/notes/armv7/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.4 2013/07/26 20:07:29 miod Exp $
+dnl	$OpenBSD: contents,v 1.1 2013/09/04 20:00:26 patrick Exp $
 TopPart
 
 	miniroot-am335x-{:--:}OSrev.fs
diff --git a/distrib/notes/beagle/features b/distrib/notes/armv7/features
index 1bee925d6bf..065c508b497 100644
--- a/distrib/notes/beagle/features
+++ b/distrib/notes/armv7/features
@@ -1,12 +1,12 @@
-dnl	$OpenBSD: features,v 1.3 2013/07/26 20:07:29 miod Exp $
+dnl	$OpenBSD: features,v 1.1 2013/09/04 20:00:26 patrick Exp $
 dnl
 dnl This file lists almost all the conditional features of this port,
 dnl which are used to provide accurate installation notes.
 dnl
 dnl Information about the installer script features should be in sync with
-dnl	src/distrib/beagle/install.md
+dnl	src/distrib/armv7/install.md
 dnl and the list files in
-dnl	src/distrib/beagle/ramdisk/list
+dnl	src/distrib/armv7/ramdisk/list
 dnl
 dnl ====
 dnl
diff --git a/distrib/notes/beagle/hardware b/distrib/notes/armv7/hardware
index 2cdb8ed73b2..8ab27057357 100644
--- a/distrib/notes/beagle/hardware
+++ b/distrib/notes/armv7/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.2 2013/07/16 18:15:10 florian Exp $
+dnl	$OpenBSD: hardware,v 1.1 2013/09/04 20:00:26 patrick Exp $
 The following machines are targeted by OpenBSD/MACHINE:
 
     BeagleBoard, BeagleBoard xM
diff --git a/distrib/notes/beagle/install b/distrib/notes/armv7/install
index 091ff50ef43..1e56e8b6eaa 100644
--- a/distrib/notes/beagle/install
+++ b/distrib/notes/armv7/install
@@ -1,4 +1,4 @@
-dnl     $OpenBSD: install,v 1.4 2013/08/02 17:11:54 florian Exp $
+dnl     $OpenBSD: install,v 1.1 2013/09/04 20:00:26 patrick Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
diff --git a/distrib/notes/beagle/prep b/distrib/notes/armv7/prep
index da01caa5c8b..41711feeb9b 100644
--- a/distrib/notes/beagle/prep
+++ b/distrib/notes/armv7/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.3 2013/08/07 19:24:54 bmercer Exp $
+dnl	$OpenBSD: prep,v 1.1 2013/09/04 20:00:26 patrick Exp $
 Please be aware that OpenBSD support for this platform is far from
 complete.
 
diff --git a/distrib/notes/armv7/upgrade b/distrib/notes/armv7/upgrade
new file mode 100644
index 00000000000..fdbcc2bc8ea
--- /dev/null
+++ b/distrib/notes/armv7/upgrade
@@ -0,0 +1,2 @@
+dnl	$OpenBSD: upgrade,v 1.1 2013/09/04 20:00:27 patrick Exp $
+OpenBSDUpgrade({:-your usual boot device-:})
diff --git a/distrib/notes/beagle/whatis b/distrib/notes/armv7/whatis
index 0fb197f141d..b1aae09b420 100644
--- a/distrib/notes/beagle/whatis
+++ b/distrib/notes/armv7/whatis
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: whatis,v 1.2 2013/09/02 09:16:56 rapha Exp $
+dnl	$OpenBSD: whatis,v 1.1 2013/09/04 20:00:27 patrick Exp $
 
 OpenBSD/MACHINE runs on the BeagleBoard and newer xM models, as well as
 PandaBoard, PandaBoard ES, BeagleBone, and BeagleBone Black. Hardware
diff --git a/distrib/notes/beagle/xfer b/distrib/notes/armv7/xfer
index 9f9f5debc94..96236afb981 100644
--- a/distrib/notes/beagle/xfer
+++ b/distrib/notes/armv7/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.1 2011/03/22 18:33:51 jasper Exp $
+dnl	$OpenBSD: xfer,v 1.1 2013/09/04 20:00:27 patrick Exp $
 
 Installation is supported from several media types, including:
 
diff --git a/distrib/notes/beagle/upgrade b/distrib/notes/beagle/upgrade
deleted file mode 100644
index 7f3be703729..00000000000
--- a/distrib/notes/beagle/upgrade
+++ /dev/null
@@ -1,2 +0,0 @@
-dnl	$OpenBSD: upgrade,v 1.1 2011/03/22 18:33:51 jasper Exp $
-OpenBSDUpgrade({:-your usual boot device-:})