Retire hp300, mvme68k and mvme88k ports. These ports have no users, keeping

this hardware alive is becoming increasingly difficult, and I should heed the
message sent by the three disks which have died on me over the last few days.

Noone sane will mourn these ports anyway. So long, and thanks for the fish.

59 files changed, 0 insertions, 2674 deletions

diff --git a/sys/arch/mvme88k/include/_float.h b/sys/arch/mvme88k/include/_float.h
deleted file mode 100644
index 795b116b305..00000000000
--- a/sys/arch/mvme88k/include/_float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
-
-#include <m88k/_float.h>
diff --git a/sys/arch/mvme88k/include/_types.h b/sys/arch/mvme88k/include/_types.h
deleted file mode 100644
index 196e5d6c031..00000000000
--- a/sys/arch/mvme88k/include/_types.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$OpenBSD: _types.h,v 1.5 2012/11/05 19:39:34 miod Exp $	*/
-
-/* public domain */
-#include <m88k/_types.h>
diff --git a/sys/arch/mvme88k/include/asm.h b/sys/arch/mvme88k/include/asm.h
deleted file mode 100644
index bb6e6218c04..00000000000
--- a/sys/arch/mvme88k/include/asm.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: asm.h,v 1.28 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/asm.h>
diff --git a/sys/arch/mvme88k/include/asm_macro.h b/sys/arch/mvme88k/include/asm_macro.h
deleted file mode 100644
index ec130cae311..00000000000
--- a/sys/arch/mvme88k/include/asm_macro.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: asm_macro.h,v 1.25 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/asm_macro.h>
diff --git a/sys/arch/mvme88k/include/atomic.h b/sys/arch/mvme88k/include/atomic.h
deleted file mode 100644
index 751ea9a18ff..00000000000
--- a/sys/arch/mvme88k/include/atomic.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
-
-/* Public Domain */
-
-#ifndef _MACHINE_ATOMIC_H_
-#define _MACHINE_ATOMIC_H_
-
-#include <m88k/atomic.h>
-
-#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/mvme88k/include/autoconf.h b/sys/arch/mvme88k/include/autoconf.h
deleted file mode 100644
index 88a84b3b21c..00000000000
--- a/sys/arch/mvme88k/include/autoconf.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$OpenBSD: autoconf.h,v 1.19 2013/05/17 22:51:59 miod Exp $ */
-/*
- * Copyright (c) 1999, Steve Murphree, Jr.
- * Copyright (c) 1996 Nivas Madhur
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Nivas Madhur.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*
- * Autoconfiguration information.
- */
-
-#ifndef _MACHINE_AUTOCONF_H_
-#define _MACHINE_AUTOCONF_H_
-
-#include <machine/bus.h>
-
-struct confargs {
-	bus_space_tag_t	ca_iot;
-	bus_dma_tag_t	ca_dmat;	
-	int		ca_bustype;	/* bus type */
-	paddr_t		ca_paddr;	/* physical address */
-	int		ca_offset;	/* offset from parent */
-	int		ca_ipl;		/* interrupt level */
-	int		ca_vec;		/* mandatory interrupt vector */
-	const char	*ca_name;	/* device name */
-};
-
-#define BUS_MAIN	0
-#define BUS_ANGELFIRE	1
-#define BUS_SYSCON	2
-#define BUS_PCCTWO	3
-#define BUS_VMES	4
-#define BUS_VMEL	5
-#define BUS_BUSSWITCH	6
-
-/* the following are from the prom/bootblocks */
-extern paddr_t	bootaddr;	/* PA of boot device */
-extern int	bootpart;	/* boot partition (disk) */
-extern int	bootbus;	/* scsi bus (disk) */
-
-vaddr_t	mapiodev(paddr_t pa, int size);
-void	unmapiodev(vaddr_t kva, int size);
-
-#endif
diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h
deleted file mode 100644
index 941e15176de..00000000000
--- a/sys/arch/mvme88k/include/board.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*	$OpenBSD: board.h,v 1.22 2013/05/17 22:46:27 miod Exp $	*/
-/*
- * Copyright (c) 2013, Miodrag Vallat
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef	_MACHINE_BOARD_H_
-#define	_MACHINE_BOARD_H_
-
-#if !defined(_LOCORE)
-
-struct cmmu_p;
-struct intrhand;
-struct mvmeprom_brdid;
-struct pmap_table;
-
-struct board {
-	void		(*bootstrap)(void);
-	vaddr_t		(*memsize)(void);
-	int		(*cpuspeed)(const struct mvmeprom_brdid *);
-	void		(*reboot)(int);
-	int		(*is_syscon)(void);
-
-	void		(*intr)(struct trapframe *);
-	int		(*nmi)(struct trapframe *);		/* 88110 */
-	void		(*nmi_wrapup)(struct trapframe *);	/* 88110 */
-
-	u_int		(*getipl)(void);
-	u_int		(*setipl)(u_int);
-	u_int		(*raiseipl)(u_int);
-
-	int		(*intsrc_available)(u_int, int);
-	void		(*intsrc_enable)(u_int, int);
-	void		(*intsrc_disable)(u_int, int);
-	int		(*intsrc_establish)(u_int, struct intrhand *,
-			    const char *);
-	void		(*intsrc_disestablish)(u_int, struct intrhand *);
-
-	void		(*init_clocks)(void);
-	void		(*delay)(int);
-
-	u_int		(*init_vme)(const char *);
-
-#ifdef	MULTIPROCESSOR
-	void		(*send_ipi)(int, cpuid_t);
-	void		(*smp_setup)(struct cpu_info *);
-#endif
-
-	const struct pmap_table *ptable;
-	const struct cmmu_p *cmmu;
-};
-
-#define	BOARD_PROTOS(b) \
-void	m##b##_bootstrap(void); \
-vaddr_t	m##b##_memsize(void); \
-int	m##b##_cpuspeed(const struct mvmeprom_brdid *); \
-void	m##b##_reboot(int); \
-int	m##b##_is_syscon(void); \
-void	m##b##_intr(struct trapframe *); \
-int	m##b##_nmi(struct trapframe *); \
-void	m##b##_nmi_wrapup(struct trapframe *); \
-u_int	m##b##_getipl(void); \
-u_int	m##b##_setipl(u_int); \
-u_int	m##b##_raiseipl(u_int); \
-int	m##b##_intsrc_available(u_int, int); \
-void	m##b##_intsrc_enable(u_int, int); \
-void	m##b##_intsrc_disable(u_int, int); \
-int	m##b##_intsrc_establish(u_int, struct intrhand *, const char *); \
-void	m##b##_intsrc_disestablish(u_int, struct intrhand *); \
-void	m##b##_init_clocks(void); \
-u_int	m##b##_init_vme(const char *); \
-void	m##b##_delay(int); \
-void	m##b##_send_ipi(int, cpuid_t); \
-void	m##b##_smp_setup(struct cpu_info *)
-
-BOARD_PROTOS(181);
-BOARD_PROTOS(187);
-BOARD_PROTOS(188);
-BOARD_PROTOS(197);
-BOARD_PROTOS(1x7);
-
-extern const struct board board_mvme181;
-extern const struct board board_mvme187;
-extern const struct board board_mvme188;
-extern const struct board board_mvme197le;
-extern const struct board board_mvme197spdp;
-
-extern const struct board *platform;
-
-#define	md_interrupt_func(f)	platform->intr(f)
-#define	md_nmi_func(f)		platform->nmi(f)
-#define	md_nmi_wrapup_func(f)	platform->nmi_wrapup(f)
-
-#endif	/* _LOCORE */
-#endif	/* _MACHINE_BOARD_H_ */
diff --git a/sys/arch/mvme88k/include/bug.h b/sys/arch/mvme88k/include/bug.h
deleted file mode 100644
index 265ad5fae22..00000000000
--- a/sys/arch/mvme88k/include/bug.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$OpenBSD: bug.h,v 1.9 2002/03/14 01:26:39 millert Exp $ */
-
-#ifndef _MACHINE_BUG_H_
-#define _MACHINE_BUG_H_
-
-struct bugenv {
-	int	clun;
-	int	dlun;
-	int	ipl;
-	int	ctlr;
-	int	(*entry)(void);
-	int	cfgblk;
-	char	*argstart;
-	char	*argend;
-};
-
-#endif	/* _MACHINE_BUG_H_ */
diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h
deleted file mode 100644
index 06e93d478c8..00000000000
--- a/sys/arch/mvme88k/include/bugio.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$OpenBSD: bugio.h,v 1.18 2013/05/14 20:30:47 miod Exp $ */
-
-#ifndef _MACHINE_BUGIO_H_
-#define _MACHINE_BUGIO_H_
-
-#include <machine/prom.h>
-
-void	buginit(void);
-char	buginchr(void);
-void	bugoutchr(int);
-void	bugreturn(void);
-void	bugbrdid(struct mvmeprom_brdid *);
-void	bugdiskrd(struct mvmeprom_dskio *);
-int	spin_cpu(cpuid_t, vaddr_t);
-
-#endif /* _MACHINE_BUGIO_H_ */
diff --git a/sys/arch/mvme88k/include/bus.h b/sys/arch/mvme88k/include/bus.h
deleted file mode 100644
index 13c1d6dcdbc..00000000000
--- a/sys/arch/mvme88k/include/bus.h
+++ /dev/null
@@ -1,811 +0,0 @@
-/*	$OpenBSD: bus.h,v 1.12 2012/12/03 07:00:11 jsg Exp $	*/
-/*
- * Copyright (c) 2004, Miodrag Vallat.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Simple mvme88k bus_space and bus_dma implementation.
- *
- * Currently, we only need specific handling for 32 bit read/writes in D16
- * space, and this choice is made at compile time.  As a result, all the
- * implementation can go through macros or inline functions, except for
- * the management functions.
- */
-
-#ifndef	_MACHINE_BUS_H_
-#define	_MACHINE_BUS_H_
-
-#include <machine/asm_macro.h>
-
-typedef	u_long	bus_addr_t;
-typedef	u_long	bus_size_t;
-
-typedef	u_long	bus_space_handle_t;
-
-struct mvme88k_bus_space_tag {
-	int	(*bs_map)(bus_addr_t, bus_size_t, int, bus_space_handle_t *);
-	void	(*bs_unmap)(bus_space_handle_t, bus_size_t);
-	int	(*bs_subregion)(bus_space_handle_t, bus_size_t, bus_size_t,
-		    bus_space_handle_t *);
-	void *	(*bs_vaddr)(bus_space_handle_t);
-	/* alloc, free not implemented yet */
-};
-
-typedef const struct mvme88k_bus_space_tag *bus_space_tag_t;
-
-#define	BUS_SPACE_BARRIER_READ	0x01
-#define	BUS_SPACE_BARRIER_WRITE	0x02
-
-#define	BUS_SPACE_MAP_CACHEABLE		0x01
-#define	BUS_SPACE_MAP_LINEAR		0x02
-#define	BUS_SPACE_MAP_PREFETCHABLE	0x04
-
-/* 
- * General bus_space function set
- */
-
-#define	bus_space_map(t,a,s,f,r)	((t)->bs_map(a,s,f,r))
-#define	bus_space_unmap(t,h,s)		((t)->bs_unmap(h,s))
-#define	bus_space_subregion(t,h,o,s,r)	((t)->bs_subregion(h,o,s,r))
-#define	bus_space_vaddr(t,h)		((t)->bs_vaddr(h))
-
-static void bus_space_barrier(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, bus_size_t, int);
-
-static __inline__ void
-bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, bus_size_t size, int flags)
-{
-	flush_pipeline();	/* overkill? */
-}
-
-/*
- * Read/Write/Region functions for D8 and D16 access.
- * Most of these are straightforward and assume that everything is properly
- * aligned.
- */
-
-#define	bus_space_read_1(tag, handle, offset) \
-	((void)(tag), *(volatile u_int8_t *)((handle) + (offset)))
-#define	bus_space_read_2(tag, handle, offset) \
-	((void)(tag), *(volatile u_int16_t *)((handle) + (offset)))
-
-static void bus_space_read_multi_1(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		*dest++ = bus_space_read_1(tag, 0, offset);
-}
-
-static void bus_space_read_multi_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int16_t *, size_t);
-
-static __inline__ void
-bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int16_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		*dest++ = bus_space_read_2(tag, 0, offset);
-}
-
-static void bus_space_read_raw_multi_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_read_raw_multi_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 1;
-	while ((int)--size >= 0) {
-		*(u_int16_t *)dest =
-		    bus_space_read_2(tag, 0, offset);
-		dest += 2;
-	}
-}
-
-static void bus_space_read_region_1(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		*dest++ = bus_space_read_1(tag, 0, offset++);
-}
-
-static void bus_space_read_region_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int16_t *, size_t);
-
-static __inline__ void
-bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int16_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0) {
-		*dest++ = bus_space_read_2(tag, 0, offset);
-		offset += 2;
-	}
-}
-
-static void bus_space_read_raw_region_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_read_raw_region_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	size >>= 1;
-	offset += handle;
-	while ((int)--size >= 0) {
-		*(u_int16_t *)dest = bus_space_read_2(tag, 0, offset);
-		offset += 2;
-		dest += 2;
-	}
-}
-
-#define	bus_space_write_1(tag, handle, offset, value) \
-	((void)(tag), *(volatile u_int8_t *)((handle) + (offset)) = (value))
-#define	bus_space_write_2(tag, handle, offset, value) \
-	((void)(tag), *(volatile u_int16_t *)((handle) + (offset)) = (value))
-
-static void bus_space_write_multi_1(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_1(tag, 0, offset, *dest++);
-}
-
-static void bus_space_write_multi_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int16_t *, size_t);
-
-static __inline__ void
-bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int16_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_2(tag, 0, offset, *dest++);
-}
-
-static void bus_space_write_raw_multi_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_write_raw_multi_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 1;
-	while ((int)--size >= 0) {
-		bus_space_write_2(tag, 0, offset, *(u_int16_t *)dest);
-		dest += 2;
-	}
-}
-
-static void bus_space_set_multi_1(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t, size_t);
-
-static __inline__ void
-bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t value, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_1(tag, 0, offset, value);
-}
-
-static void bus_space_set_multi_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int16_t, size_t);
-
-static __inline__ void
-bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int16_t value, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_2(tag, 0, offset, value);
-}
-
-static void bus_space_write_region_1(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_1(tag, 0, offset++, *dest++);
-}
-
-static void bus_space_write_region_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int16_t *, size_t);
-
-static __inline__ void
-bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int16_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0) {
-		bus_space_write_2(tag, 0, offset, *dest++);
-		offset += 2;
-	}
-}
-
-static void bus_space_write_raw_region_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_write_raw_region_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 1;
-	while ((int)--size >= 0) {
-		bus_space_write_2(tag, 0, offset, *(u_int16_t *)dest);
-		offset += 2;
-		dest += 2;
-	}
-}
-
-static void bus_space_set_region_1(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t, size_t);
-
-static __inline__ void
-bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t value, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_1(tag, 0, offset++, value);
-}
-
-static void bus_space_set_region_2(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int16_t, size_t);
-
-static __inline__ void
-bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int16_t value, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0) {
-		bus_space_write_2(tag, 0, offset, value);
-		offset += 2;
-	}
-}
-
-static void bus_space_copy_1(bus_space_tag_t, bus_space_handle_t, bus_addr_t,
-    bus_space_handle_t, bus_addr_t, bus_size_t);
-
-static __inline__ void
-bus_space_copy_1(bus_space_tag_t tag, bus_space_handle_t h1, bus_addr_t o1,
-    bus_space_handle_t h2, bus_addr_t o2, bus_size_t count)
-{
-	o1 += h1;
-	o2 += h2;
-	while ((int)--count >= 0) {
-		*(volatile u_int8_t *)o1 = *(volatile u_int8_t *)o2;
-		o1++;
-		o2++;
-	}
-}
-
-static void bus_space_copy_2(bus_space_tag_t, bus_space_handle_t, bus_addr_t,
-    bus_space_handle_t, bus_addr_t, bus_size_t);
-
-static __inline__ void
-bus_space_copy_2(bus_space_tag_t tag, bus_space_handle_t h1, bus_addr_t o1,
-    bus_space_handle_t h2, bus_addr_t o2, bus_size_t count)
-{
-	o1 += h1;
-	o2 += h2;
-	while ((int)--count >= 0) {
-		*(volatile u_int16_t *)o1 = *(volatile u_int16_t *)o2;
-		o1 += 2;
-		o2 += 2;
-	}
-}
-
-/*
- * Unrestricted D32 access
- */
-
-#ifndef	__BUS_SPACE_RESTRICT_D16__
-
-#define	bus_space_read_4(tag, handle, offset) \
-	((void)(tag), *(volatile u_int32_t *)((handle) + (offset)))
-
-static void bus_space_read_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t *, size_t);
-
-static __inline__ void
-bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		*dest++ = bus_space_read_4(tag, 0, offset);
-}
-
-static void bus_space_read_raw_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_read_raw_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 2;
-	while ((int)--size >= 0) {
-		*(u_int32_t *)dest =
-		    bus_space_read_4(tag, 0, offset);
-		dest += 4;
-	}
-}
-
-static void bus_space_read_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t *, size_t);
-
-static __inline__ void
-bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0) {
-		*dest++ = bus_space_read_4(tag, 0, offset);
-		offset += 4;
-	}
-}
-
-static void bus_space_read_raw_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_read_raw_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	size >>= 2;
-	offset += handle;
-	while ((int)--size >= 0) {
-		*(u_int32_t *)dest = bus_space_read_4(tag, 0, offset);
-		offset += 4;
-		dest += 4;
-	}
-}
-
-#define	bus_space_write_4(tag, handle, offset, value) \
-	((void)(tag), *(volatile u_int32_t *)((handle) + (offset)) = (value))
-
-static void bus_space_write_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t *, size_t);
-
-static __inline__ void
-bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_4(tag, 0, offset, *dest++);
-}
-
-static void bus_space_write_raw_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_write_raw_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 2;
-	while ((int)--size >= 0) {
-		bus_space_write_4(tag, 0, offset, *(u_int32_t *)dest);
-		dest += 4;
-	}
-}
-
-static void bus_space_set_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t, size_t);
-
-static __inline__ void
-bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t value, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_4(tag, 0, offset, value);
-}
-
-static void bus_space_write_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t *, size_t);
-
-static __inline__ void
-bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0) {
-		bus_space_write_4(tag, 0, offset, *dest++);
-		offset += 4;
-	}
-}
-
-static void bus_space_write_raw_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_write_raw_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 2;
-	while ((int)--size >= 0) {
-		bus_space_write_4(tag, 0, offset, *(u_int32_t *)dest);
-		offset += 4;
-		dest += 4;
-	}
-}
-
-static void bus_space_set_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t, size_t);
-
-static __inline__ void
-bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t value, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0) {
-		bus_space_write_4(tag, 0, offset, value);
-		offset += 4;
-	}
-}
-
-static void bus_space_copy_4(bus_space_tag_t, bus_space_handle_t, bus_addr_t,
-    bus_space_handle_t, bus_addr_t, bus_size_t);
-
-static __inline__ void
-bus_space_copy_4(bus_space_tag_t tag, bus_space_handle_t h1, bus_addr_t o1,
-    bus_space_handle_t h2, bus_addr_t o2, bus_size_t count)
-{
-	o1 += h1;
-	o2 += h2;
-	while ((int)--count >= 0) {
-		*(volatile u_int32_t *)o1 = *(volatile u_int32_t *)o2;
-		o1 += 4;
-		o2 += 4;
-	}
-}
-
-#else	/* __BUS_SPACE_RESTRICT_D16__ */
-
-/*
- * Restricted D32 access - done through two adjacent D16 access.
- *
- * The speed of the basic read and write routines is critical.
- * This implementation uses a temporary variable on stack, and does
- * two 16 bit load&store sequences. Since the stack is in Dcache, this
- * is faster and spills fewer register than a register-only sequence
- * (which would need to ld.h into two distinct registers, then extu
- * the second one into itself, and or both in the result register).
- */
-
-static u_int32_t d16_read_4(vaddr_t);
-static void d16_write_4(vaddr_t, u_int32_t);
-
-static __inline__ u_int32_t
-d16_read_4(vaddr_t va)
-{
-	u_int32_t tmp;
-
-	*(u_int16_t *)&tmp = *(volatile u_int16_t *)va;
-	*(u_int16_t *)((vaddr_t)&tmp + 2) = *(volatile u_int16_t *)(va + 2);
-
-	return tmp;
-}
-
-static __inline__ void
-d16_write_4(vaddr_t va, u_int32_t value)
-{
-	u_int32_t tmp = value;
-
-	*(volatile u_int16_t *)va = *(u_int16_t *)&tmp;
-	*(volatile u_int16_t *)(va + 2) = *(u_int16_t *)((vaddr_t)&tmp + 2);
-}
-
-#define	bus_space_read_4(tag, handle, offset) \
-	((void)(tag), d16_read_4((handle) + (offset)))
-
-static void bus_space_read_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t *, size_t);
-
-static __inline__ void
-bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		*dest++ = bus_space_read_4(tag, 0, offset);
-}
-
-static void bus_space_read_raw_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_read_raw_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 1;
-	while ((int)--size >= 0) {
-		*(u_int16_t *)dest = bus_space_read_2(tag, 0, offset);
-		dest += 2;
-	}
-}
-
-static void bus_space_read_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t *, size_t);
-
-static __inline__ void
-bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t *__dest, size_t count)
-{
-	u_int16_t *dest = (u_int16_t *)__dest;
-
-	offset += handle;
-	count <<= 1;
-	while ((int)--count >= 0) {
-		*dest++ = bus_space_read_2(tag, 0, offset);
-		offset += 2;
-	}
-}
-
-static void bus_space_read_raw_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_read_raw_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	size >>= 1;
-	offset += handle;
-	while ((int)--size >= 0) {
-		*(u_int16_t *)dest = bus_space_read_2(tag, 0, offset);
-		offset += 2;
-		dest += 2;
-	}
-}
-
-#define	bus_space_write_4(tag, handle, offset, value) \
-	((void)(tag), d16_write_4((handle) + (offset), (value)))
-
-static void bus_space_write_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t *, size_t);
-
-static __inline__ void
-bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t *dest, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_4(tag, 0, offset, *dest++);
-}
-
-static void bus_space_write_raw_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_write_raw_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 1;
-	while ((int)--size >= 0) {
-		bus_space_write_2(tag, 0, offset, *(u_int16_t *)dest);
-		dest += 2;
-	}
-}
-
-static void bus_space_set_multi_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t, size_t);
-
-static __inline__ void
-bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t value, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0)
-		bus_space_write_4(tag, 0, offset, value);
-}
-
-static void bus_space_write_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t *, size_t);
-
-static __inline__ void
-bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t *__dest, size_t count)
-{
-	u_int16_t *dest = (u_int16_t *)__dest;
-
-	offset += handle;
-	count <<= 1;
-	while ((int)--count >= 0) {
-		bus_space_write_2(tag, 0, offset, *dest++);
-		offset += 2;
-	}
-}
-
-static void bus_space_write_raw_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int8_t *, size_t);
-
-static __inline__ void
-bus_space_write_raw_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int8_t *dest, size_t size)
-{
-	offset += handle;
-	size >>= 1;
-	while ((int)--size >= 0) {
-		bus_space_write_2(tag, 0, offset, *(u_int16_t *)dest);
-		offset += 2;
-		dest += 2;
-	}
-}
-
-static void bus_space_set_region_4(bus_space_tag_t, bus_space_handle_t,
-    bus_addr_t, u_int32_t, size_t);
-
-static __inline__ void
-bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset, u_int32_t value, size_t count)
-{
-	offset += handle;
-	while ((int)--count >= 0) {
-		bus_space_write_4(tag, 0, offset, value);
-		offset += 4;
-	}
-}
-
-static void bus_space_copy_4(bus_space_tag_t, bus_space_handle_t, bus_addr_t,
-    bus_space_handle_t, bus_addr_t, bus_size_t);
-
-static __inline__ void
-bus_space_copy_4(bus_space_tag_t tag, bus_space_handle_t h1, bus_addr_t o1,
-    bus_space_handle_t h2, bus_addr_t o2, bus_size_t count)
-{
-	o1 += h1;
-	o2 += h2;
-	count <<= 1;
-	while ((int)--count >= 0) {
-		*(volatile u_int16_t *)o1 = *(volatile u_int16_t *)o2;
-		o1 += 2;
-		o2 += 2;
-	}
-}
-
-#endif	/* __BUS_SPACE_RESTRICT_D16__ */
-
-/*
- * Extra D16 access functions (see vme.c)
- */
-
-void d16_bcopy(const void *, void *, size_t);
-void d16_bzero(void *, size_t);
-
-/*
- * Bus DMA implementation
- */
-
-#define	BUS_DMA_WAITOK		0x000	/* safe to sleep (pseudo-flag) */
-#define	BUS_DMA_NOWAIT		0x001	/* not safe to sleep */
-#define	BUS_DMA_ALLOCNOW	0x002	/* perform resource allocation now */
-#define	BUS_DMA_COHERENT	0x004	/* hint: map memory DMA coherent */
-#define	BUS_DMA_BUS1		0x010	/* placeholders for bus functions... */
-#define	BUS_DMA_BUS2		0x020
-#define	BUS_DMA_BUS3		0x040
-#define	BUS_DMA_BUS4		0x080
-#define	BUS_DMA_READ		0x100	/* mapping is device -> memory only */
-#define	BUS_DMA_WRITE		0x200	/* mapping is memory -> device only */
-#define	BUS_DMA_STREAMING	0x400	/* hint: sequential, unidirectional */
-#define	BUS_DMA_ZERO		0x800	/* zero memory in dmamem_alloc */
-
-#define BUS_DMASYNC_PREREAD	0x01
-#define BUS_DMASYNC_POSTREAD	0x02
-#define BUS_DMASYNC_PREWRITE	0x04
-#define BUS_DMASYNC_POSTWRITE	0x08
-
-typedef	u_int32_t	bus_dma_tag_t;	/* ignored, really */
-
-/*
- *	bus_dma_segment_t
- *
- *	Describes a single contiguous DMA transaction.  Values
- *	are suitable for programming into DMA registers.
- */
-struct m88k_bus_dma_segment {
-	bus_addr_t	ds_addr;	/* DMA address */
-	bus_size_t	ds_len;		/* length of transfer */
-};
-typedef struct m88k_bus_dma_segment  bus_dma_segment_t;
-
-/*
- *	bus_dmamap_t
- *
- *	Describes a DMA mapping.
- */
-struct m88k_bus_dmamap {
-	bus_size_t	_dm_size;	/* largest DMA transfer mappable */
-	int		_dm_segcnt;	/* number of segs this map can map */
-	bus_size_t	_dm_maxsegsz;	/* largest possible segment */
-	bus_size_t	_dm_boundary;	/* don't cross this */
-
-	bus_size_t	dm_mapsize;	/* size of the mapping */
-	int		dm_nsegs;	/* # valid segments in mapping */
-	bus_dma_segment_t dm_segs[1];	/* segments; variable length */
-};
-typedef struct m88k_bus_dmamap		*bus_dmamap_t;
-
-struct mbuf;
-struct proc;
-struct uio;
-
-int	bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
-	    bus_size_t, int, bus_dmamap_t *);
-void	bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
-int	bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int);
-int	bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int);
-int	bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int);
-int	bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *,
-	    int, bus_size_t, int);
-void	bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
-void	bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
-	    bus_size_t, int);
-
-int	bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
-	    bus_size_t alignment, bus_size_t boundary,
-	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
-void	bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs);
-int	bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs, size_t size, caddr_t *kvap, int flags);
-void	bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
-	    size_t size);
-paddr_t bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs, off_t off, int prot, int flags);
-
-#endif	/* _MACHINE_BUS_H_ */
diff --git a/sys/arch/mvme88k/include/cdefs.h b/sys/arch/mvme88k/include/cdefs.h
deleted file mode 100644
index 56a6abacdae..00000000000
--- a/sys/arch/mvme88k/include/cdefs.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $OpenBSD: cdefs.h,v 1.13 2005/11/24 20:46:47 deraadt Exp $ */
-/* public domain */
-
-#include <m88k/cdefs.h>
diff --git a/sys/arch/mvme88k/include/cmmu.h b/sys/arch/mvme88k/include/cmmu.h
deleted file mode 100644
index 9628f7d9fb7..00000000000
--- a/sys/arch/mvme88k/include/cmmu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: cmmu.h,v 1.20 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/cmmu.h>
diff --git a/sys/arch/mvme88k/include/conf.h b/sys/arch/mvme88k/include/conf.h
deleted file mode 100644
index 10862f35f9d..00000000000
--- a/sys/arch/mvme88k/include/conf.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$OpenBSD: conf.h,v 1.4 2006/04/27 20:13:44 miod Exp $	*/
-/*
- * Copyright (c) 2002, Miodrag Vallat.
- * All rights reserved.
- *
- * Permission to redistribute, use, copy, and modify this software
- * is hereby granted without fee, provided that the following
- * conditions are met:
- *
- * 1. This entire notice is included in all source code copies of any
- *    software which is or includes a copy or modification of this
- *    software.
- * 2. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/conf.h>
-
-#define	mmread	mmrw
-#define	mmwrite	mmrw
-cdev_decl(mm);
-
-cdev_decl(vmel);
-cdev_decl(vmes);
-
-cdev_decl(nvram);
-
-#define	sramread  sramrw
-#define	sramwrite sramrw
-cdev_decl(sram);
-
-cdev_decl(bugtty);
-cdev_decl(cl);
-cdev_decl(dart);
-cdev_decl(vx);
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
deleted file mode 100644
index 5ede70aacd1..00000000000
--- a/sys/arch/mvme88k/include/cpu.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $OpenBSD: cpu.h,v 1.47 2013/05/17 22:46:27 miod Exp $ */
-/*
- * Copyright (c) 1996 Nivas Madhur
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Lawrence Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef	_MACHINE_CPU_H_
-#define	_MACHINE_CPU_H_
-
-#include <m88k/cpu.h>
-
-#ifdef _KERNEL
-
-extern int cpuspeed;
-
-__dead void doboot(void);
-void	nmihand(void *);
-
-/* M88100 PFSR machine-dependent code snippets */
-extern u_int32_t pfsr_save_single[];
-extern u_int32_t pfsr_save_188_straight[];
-extern u_int32_t pfsr_save_188_double[];
-extern u_int32_t pfsr_save_188_quad[];
-
-#endif /* _KERNEL */
-
-#endif
diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h
deleted file mode 100644
index fb5a0db9d61..00000000000
--- a/sys/arch/mvme88k/include/db_machdep.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $OpenBSD: db_machdep.h,v 1.30 2005/10/24 19:28:29 miod Exp $ */
-/* public domain */
-#include <m88k/db_machdep.h>
-
-#ifdef DDB
-
-void m88k_db_prom_cmd(db_expr_t, int, db_expr_t, char *);
-
-#define	EXTRA_MACHDEP_COMMANDS \
-	{ "prom",	m88k_db_prom_cmd,		0,	NULL },
-
-#endif
diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h
deleted file mode 100644
index bbce10c66a6..00000000000
--- a/sys/arch/mvme88k/include/disklabel.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*	$OpenBSD: disklabel.h,v 1.15 2011/03/23 16:54:36 pirofti Exp $ */
-
-/*
- * Copyright (c) 1996 Nivas Madhur
- * Copyright (c) 1995 Dale Rahn.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _MACHINE_DISKLABEL_H_
-#define _MACHINE_DISKLABEL_H_
-
-#define LABELSECTOR     0                       /* sector containing label */
-#define LABELOFFSET	0			/* offset of label in sector */
-#define MAXPARTITIONS	16			/* number of partitions */
-
-/*
- * Note: this structure is exactly 512 bytes in size. If you move fields
- * around, make sure the various members are properly aligned and the
- * compiler won't do any additional padding.
- */
-struct mvmedisklabel {
-	/* VID */
-	u_char		vid_id[4];
-	u_char		vid_0[16];
-	u_int		vid_oss;
-	u_short		vid_osl;
-	u_char		vid_1[4];
-	u_short		vid_osa_u;
-	u_short		vid_osa_l;
-	u_char		version;
-	u_char		vid_2[1];
-	u_short		checksum;	/* 2 */
-	u_short		partitions;
-	u_char		vid_vd[16];
-	u_long		bbsize;
-	u_long		magic1;		/* 4 */
-	u_short		type;		/* 2 */
-	u_short		subtype;	/* 2 */
-	u_char		packname[16];	/* 16 */
-	u_long		flags;		/* 4 */
-	u_long		drivedata[5];	/* 4 */
-	u_long		spare[5];	/* 4 */
-
-	u_long		secpercyl;	/* 4 */
-	u_long		secperunit;	/* 4 */
-	u_long		headswitch;	/* 4 */
-
-	u_char		vid_3[4];
-	u_int		vid_cas;
-	u_char		vid_cal;
-	u_char		vid_4_0[3];
-	u_char		vid_4[64];
-	u_char		vid_4_1[28];
-	u_long		sbsize;
-	u_char		vid_mot[8];
-
-	/* CFG */
-	u_char		cfg_0[4];
-	u_short		cfg_atm;
-	u_short		cfg_prm;
-	u_short		cfg_atw;
-	u_short		cfg_rec;
-
-	u_short		sparespertrack;
-	u_short		sparespercyl;
-	u_long		acylinders;
-	u_short		rpm;
-	u_short		cylskew;
-
-	u_char		cfg_spt;
-	u_char		cfg_hds;
-	u_short		cfg_trk;
-	u_char		cfg_ilv;
-	u_char		cfg_sof;
-	u_short		cfg_psm;
-	u_short		cfg_shd;
-	u_char		cfg_2[2];
-	u_short		cfg_pcom;
-	u_char		cfg_3;
-	u_char		cfg_ssr;
-	u_short		cfg_rwcc;
-	u_short		cfg_ecc;
-	u_short		cfg_eatm;
-	u_short		cfg_eprm;
-	u_short		cfg_eatw;
-	u_char		cfg_gpb1;
-	u_char		cfg_gpb2;
-	u_char		cfg_gpb3;
-	u_char		cfg_gpb4;
-	u_char		cfg_ssc;
-	u_char		cfg_runit;
-	u_short		cfg_rsvc1;
-	u_short		cfg_rsvc2;
-	u_long		magic2;
-	u_char		cfg_4[192];
-};
-
-#endif /* _MACHINE_DISKLABEL_H_ */
diff --git a/sys/arch/mvme88k/include/endian.h b/sys/arch/mvme88k/include/endian.h
deleted file mode 100644
index 8dbb9e379f5..00000000000
--- a/sys/arch/mvme88k/include/endian.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: endian.h,v 1.15 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/endian.h>
diff --git a/sys/arch/mvme88k/include/exec.h b/sys/arch/mvme88k/include/exec.h
deleted file mode 100644
index 7581662701b..00000000000
--- a/sys/arch/mvme88k/include/exec.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: exec.h,v 1.13 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/exec.h>
diff --git a/sys/arch/mvme88k/include/fenv.h b/sys/arch/mvme88k/include/fenv.h
deleted file mode 100644
index b18bcdccfc2..00000000000
--- a/sys/arch/mvme88k/include/fenv.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$OpenBSD: fenv.h,v 1.2 2013/06/01 21:20:54 jasper Exp $	*/
-/* public domain */
-#include <m88k/fenv.h>
diff --git a/sys/arch/mvme88k/include/fpu.h b/sys/arch/mvme88k/include/fpu.h
deleted file mode 100644
index 8493e1b3c62..00000000000
--- a/sys/arch/mvme88k/include/fpu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: fpu.h,v 1.1 2007/12/08 18:39:50 miod Exp $ */
-/* public domain */
-#include <m88k/fpu.h>
diff --git a/sys/arch/mvme88k/include/frame.h b/sys/arch/mvme88k/include/frame.h
deleted file mode 100644
index f06ca59033d..00000000000
--- a/sys/arch/mvme88k/include/frame.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: frame.h,v 1.11 2007/01/13 22:00:56 miod Exp $ */
-/* public domain */
-#include <m88k/frame.h>
diff --git a/sys/arch/mvme88k/include/ieee.h b/sys/arch/mvme88k/include/ieee.h
deleted file mode 100644
index 070fa657f95..00000000000
--- a/sys/arch/mvme88k/include/ieee.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: ieee.h,v 1.7 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/ieee.h>
diff --git a/sys/arch/mvme88k/include/ieeefp.h b/sys/arch/mvme88k/include/ieeefp.h
deleted file mode 100644
index ced865e1507..00000000000
--- a/sys/arch/mvme88k/include/ieeefp.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: ieeefp.h,v 1.6 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/ieeefp.h>
diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h
deleted file mode 100644
index 2ffdc01be83..00000000000
--- a/sys/arch/mvme88k/include/intr.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*	$OpenBSD: intr.h,v 1.24 2013/06/16 14:49:49 kettenis Exp $	*/
-/*
- * Copyright (C) 2000 Steve Murphree, Jr.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1996 Nivas Madhur
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Lawrence Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _MACHINE_INTR_H_
-#define _MACHINE_INTR_H_
-
-/*
- * IPL levels.
- * We use 6 as IPL_HIGH so that abort can be programmed at 7 so that
- * it is always possible to break into the system unless interrupts
- * are disabled.
- */
-
-#define IPL_NONE	0
-#define IPL_SOFTINT	1
-#define IPL_BIO		2
-#define IPL_NET		3
-#define IPL_TTY		5
-#define IPL_VM		5
-#define IPL_CLOCK	5
-#define IPL_STATCLOCK	5
-#define	IPL_SCHED	5
-#define IPL_HIGH	6
-#define IPL_NMI		7
-#define IPL_ABORT	7
-
-#define	NIPLS		8
-
-#define	IPL_MPSAFE	0	/* no "mpsafe" interrupts */
-
-#if defined(_KERNEL) && !defined(_LOCORE)
-
-#include <sys/evcount.h>
-
-struct intrhand {
-	SLIST_ENTRY(intrhand) ih_link;
-	int	(*ih_fn)(void *);
-	void	*ih_arg;
-	int	ih_ipl;
-	int	ih_wantframe;
-	struct evcount ih_count;
-};
-
-int	intr_establish(int, struct intrhand *, const char *);
-int	intr_findvec(int, int, int);
-
-/*
- * There are 256 possible VME interrupt vectors on a mvme88k platform
- * (although some systems use VME vectors for onboard devices).
- * Use either vmeintr_establish() or intr_establish() to register a handler
- * for the given vector. Vector number is used to index into the
- * intr_handlers[] table.
- */
-#define	NVMEINTR	256
-typedef SLIST_HEAD(, intrhand) intrhand_t;
-extern intrhand_t intr_handlers[NVMEINTR];
-
-/*
- * Currently registered VME interrupt vectors for a given IPL, if they
- * are unique. Used to help the MVME181 and MVME188 interrupt handlers when
- * they fail to complete the VME interrupt acknowledge cycle to get the
- * interrupt vector number.
- */
-extern u_int vmevec_hints[NIPLS];
-
-/* Interrupt masks (MVME181, MVME188) */
-extern u_int32_t int_mask_val[NIPLS];
-
-/*
- * Logical values for non-VME interrupt sources on boards with dedicated
- * interrupt controllers (MVME181, MVME188). Not all sources may be available
- * on a given board.
- */
-
-#define	INTSRC_ABORT	1	/* abort button */
-#define	INTSRC_ACFAIL	2	/* AC failure */
-#define	INTSRC_SYSFAIL	3	/* system failure */
-#define	INTSRC_PARERR	4	/* memory parity error */
-#define	INTSRC_CIO	5	/* Z8536 */
-#define	INTSRC_DTIMER	6	/* MC68692 timer interrupt */
-#define	INTSRC_DUART	7	/* MC68692 serial interrupt */
-#define	INTSRC_VME	8	/* up to seven VME interrupt levels */
-
-#endif /* _KERNEL && !_LOCORE */
-
-#include <m88k/intr.h>
-
-#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/mvme88k/include/kcore.h b/sys/arch/mvme88k/include/kcore.h
deleted file mode 100644
index 3ba95570ea1..00000000000
--- a/sys/arch/mvme88k/include/kcore.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: kcore.h,v 1.4 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/kcore.h>
diff --git a/sys/arch/mvme88k/include/limits.h b/sys/arch/mvme88k/include/limits.h
deleted file mode 100644
index bcbdfdd27a0..00000000000
--- a/sys/arch/mvme88k/include/limits.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: limits.h,v 1.14 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/limits.h>
diff --git a/sys/arch/mvme88k/include/loadfile_machdep.h b/sys/arch/mvme88k/include/loadfile_machdep.h
deleted file mode 100644
index 101235faf50..00000000000
--- a/sys/arch/mvme88k/include/loadfile_machdep.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.3 2013/10/17 11:54:01 miod Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define BOOT_ELF
-
-#define LOAD_KERNEL		LOAD_ALL
-#define COUNT_KERNEL		COUNT_ALL
-
-#define LOADADDR(a)		(((u_long)(a)) + offset)
-#define ALIGNENTRY(a)		((u_long)(a) & ~0x0fff)
-#define READ(f, b, c)		read((f), (void *)LOADADDR(b), (c))
-#define BCOPY(s, d, c)		memcpy((void *)LOADADDR(d), (void *)(s), (c))
-#define BZERO(d, c)		memset((void *)LOADADDR(d), 0, (c))
-#define	WARN(a)			(void)(printf a, \
-				    printf((errno ? ": %s\n" : "\n"), \
-				    strerror(errno)))
-#define PROGRESS(a)		(void) printf a
-#define ALLOC(a)		alloc(a)
-#define FREE(a, b)		free(a, b)
diff --git a/sys/arch/mvme88k/include/lock.h b/sys/arch/mvme88k/include/lock.h
deleted file mode 100644
index a1cceb2c9f8..00000000000
--- a/sys/arch/mvme88k/include/lock.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: lock.h,v 1.1 2005/12/03 19:04:06 miod Exp $ */
-/* public domain */
-#include <m88k/lock.h>
diff --git a/sys/arch/mvme88k/include/m88100.h b/sys/arch/mvme88k/include/m88100.h
deleted file mode 100644
index fe5f385f0c7..00000000000
--- a/sys/arch/mvme88k/include/m88100.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: m88100.h,v 1.13 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/m88100.h>
diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h
deleted file mode 100644
index b3bac27a831..00000000000
--- a/sys/arch/mvme88k/include/m88110.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*	$OpenBSD: m88110.h,v 1.25 2011/10/25 18:38:06 miod Exp $ */
-
-#ifndef	_MACHINE_M88110_H_
-#define	_MACHINE_M88110_H_
-
-/*
- *	88110 CMMU definitions
- */
-
-#define	CMMU_ICMD_INV_ITIC	0x001	/* Invalidate Inst Cache & TIC */
-#define	CMMU_ICMD_INV_TIC	0x002	/* Invalidate TIC */
-#define	CMMU_ICMD_INV_LINE	0x005	/* Invalidate Inst Cache Line */
-#define	CMMU_ICMD_PRB_SUPR	0x008	/* MMU Probe Supervisor */
-#define	CMMU_ICMD_PRB_USER	0x009	/* MMU Probe User */
-#define	CMMU_ICMD_INV_SATC	0x00a	/* Invalidate All Supervisor ATCs */
-#define	CMMU_ICMD_INV_UATC	0x00b	/* Invalidate All User ATCs */
-
-#define	CMMU_ICTL_DID		0x8000	/* Double instruction disable */
-#define	CMMU_ICTL_PREN		0x4000	/* Branch Prediction Enable */
-#define	CMMU_ICTL_FRZ0		0x0100	/* Inst Cache Freeze Bank 0 */
-#define	CMMU_ICTL_FRZ1		0x0080	/* Inst Cache Freeze Bank 1 */
-#define	CMMU_ICTL_HTEN		0x0040	/* Hardware Table Search Enable */
-#define	CMMU_ICTL_MEN		0x0020	/* Inst MMU Enable */
-#define	CMMU_ICTL_BEN		0x0004	/* TIC Cache Enable */
-#define	CMMU_ICTL_CEN		0x0001	/* Inst Cache Enable */
-
-#define	CMMU_ISR_TBE		0x200000 /* Table Search Bus Error */
-#define	CMMU_ISR_SI		0x100000 /* Segment Fault*/
-#define	CMMU_ISR_PI		0x080000 /* Page Fault */
-#define	CMMU_ISR_SP		0x040000 /* Supervisor Protection Violation */
-#define	CMMU_ISR_PH		0x000800 /* PATC Hit */
-#define	CMMU_ISR_BH		0x000400 /* BATC Hit */
-#define	CMMU_ISR_SU		0x000200 /* Supervisor Bit */
-#define	CMMU_ISR_BE		0x000001 /* Bus Error */
-
-#define	CMMU_DCMD_WB_PG		0x000	/* Flush Data Cache Page (sync) */
-#define	CMMU_DCMD_INV_ALL	0x001	/* Invalidate Data Cache All */
-#define	CMMU_DCMD_WB_ALL	0x002	/* Flush Data Cache All (sync) */
-#define	CMMU_DCMD_WBINV_ALL	0x003	/* Flush Data Cache All (sync + inv) */
-#define	CMMU_DCMD_WBINV_PG	0x004	/* Flush Data Cache Page (sync + inv) */
-#define	CMMU_DCMD_INV_LINE	0x005	/* Invalidate Data Cache Line */
-#define	CMMU_DCMD_WB_LINE	0x006	/* Flush Data Cache Line (sync) */
-#define	CMMU_DCMD_WBINV_LINE	0x007	/* Flush Data Cache Line (sync + inv) */
-#define	CMMU_DCMD_PRB_SUPR	0x008	/* MMU Probe Supervisor */
-#define	CMMU_DCMD_PRB_USER	0x009	/* MMU Probe User */
-#define	CMMU_DCMD_INV_SATC	0x00a	/* Invalidate All Supervisor ATCs */
-#define	CMMU_DCMD_INV_UATC	0x00b	/* Invalidate All User ATCs */
-
-#define	CMMU_DCTL_RSVD7		0x40000	/* Reserved */
-#define	CMMU_DCTL_RSVD6		0x20000	/* Reserved */
-#define	CMMU_DCTL_RSVD5		0x10000	/* Reserved */
-#define	CMMU_DCTL_RSVD4		0x8000	/* Reserved */
-#define	CMMU_DCTL_RSVD3		0x4000	/* Reserved */
-#define	CMMU_DCTL_XMEM		0x2000	/* store -> load sequence */
-#define	CMMU_DCTL_DEN		0x1000	/* Decoupled Cache Access Enable */
-#define	CMMU_DCTL_FWT		0x0800	/* Force Write Through */
-#define	CMMU_DCTL_BPEN1		0x0400	/* Break Point Enable 1 */
-#define	CMMU_DCTL_BPEN0		0x0200	/* Break Point Enable 0 */
-#define	CMMU_DCTL_FRZ0		0x0100	/* Data Cache Freeze Bank 0 */
-#define	CMMU_DCTL_FRZ1		0x0080	/* Data Cache Freeze Bank 1 */
-#define	CMMU_DCTL_HTEN		0x0040	/* Hardware Table Search Enable */
-#define	CMMU_DCTL_MEN		0x0020	/* Data MMU Enable */
-#define	CMMU_DCTL_RSVD2		0x0010	/* Reserved */
-#define	CMMU_DCTL_ADS		0x0008	/* Allocate Disable */
-#define	CMMU_DCTL_RSVD1		0x0004	/* Reserved */
-#define	CMMU_DCTL_SEN		0x0002	/* Data Cache Snoop Enable */
-#define	CMMU_DCTL_CEN		0x0001	/* Data Cache Enable */
-
-#define	CMMU_DSR_TBE		0x200000 /* Table Search Bus Error */
-#define	CMMU_DSR_SI		0x100000 /* Segment Fault */
-#define	CMMU_DSR_PI		0x080000 /* Page Fault */
-#define	CMMU_DSR_SP		0x040000 /* Supervisor Protection Violation */
-#define	CMMU_DSR_WE		0x020000 /* Write Protection Violation */
-#define	CMMU_DSR_BPE		0x010000 /* Break Point Exception */
-#define	CMMU_DSR_PH		0x000800 /* PATC Hit */
-#define	CMMU_DSR_BH		0x000400 /* BATC Hit */
-#define	CMMU_DSR_SU		0x000200 /* Supervisor Bit */
-#define	CMMU_DSR_RW		0x000100 /* Read Bit */
-#define	CMMU_DSR_CP		0x000004 /* Copyback Error */
-#define	CMMU_DSR_WA		0x000002 /* Write-Allocate Bus Error */
-#define	CMMU_DSR_BE		0x000001 /* Bus Error */
-
-/* definitions for use of the BATC */
-#define	BATC_512K		(0x00 << BATC_BLKSHIFT)
-#define	BATC_1M			(0x01 << BATC_BLKSHIFT)
-#define	BATC_2M			(0x03 << BATC_BLKSHIFT)
-#define	BATC_4M			(0x07 << BATC_BLKSHIFT)
-#define	BATC_8M			(0x0f << BATC_BLKSHIFT)
-#define	BATC_16M		(0x1f << BATC_BLKSHIFT)
-#define	BATC_32M		(0x3f << BATC_BLKSHIFT)
-#define	BATC_64M		(0x7f << BATC_BLKSHIFT)
-
-/*
- * PATC fields
- */
-
-#define	PATC_VA_MASK		0xfffff000
-#define	PATC_SO			0x00000001
-
-/*
- * Cache line information
- */
-#define	MC88110_CACHE_SHIFT	5
-#define	MC88110_CACHE_LINE	(1 << MC88110_CACHE_SHIFT)
-
-#ifndef	_LOCORE
-
-void	 set_icmd(uint32_t);
-void	 set_ictl(uint32_t);
-void	 set_isar(uint32_t);
-void	 set_isap(uint32_t);
-void	 set_iuap(uint32_t);
-void	 set_iir(uint32_t);
-void	 set_ibp(uint32_t);
-void	 set_ippu(uint32_t);
-void	 set_ippl(uint32_t);
-void	 set_isr(uint32_t);
-void	 set_dcmd(uint32_t);
-void	 set_dctl(uint32_t);
-void	 set_dsar(uint32_t);
-void	 set_dsap(uint32_t);
-void	 set_duap(uint32_t);
-void	 set_dir(uint32_t);
-void	 set_dbp(uint32_t);
-void	 set_dppu(uint32_t);
-void	 set_dppl(uint32_t);
-void	 set_dsr(uint32_t);
-
-uint32_t get_dctl(void);
-uint32_t get_dsr(void);
-uint32_t get_ictl(void);
-uint32_t get_isr(void);
-
-/*
- * The following inlines expect their address to be line-aligned for line
- * operations, and page aligned for page operations.
- */
-
-static __inline__ void
-mc88110_wb_data_line(paddr_t x)
-{
-	set_dsar(x);
-	set_dcmd(CMMU_DCMD_WB_LINE);
-}
-
-static __inline__ void
-mc88110_wb_data_page(paddr_t x)
-{
-	set_dsar(x);
-	set_dcmd(CMMU_DCMD_WB_PG);
-}
-
-static __inline__ void
-mc88110_wb_data(void)
-{
-	set_dcmd(CMMU_DCMD_WB_ALL);
-}
-
-static __inline__ void
-mc88110_inval_data_line(paddr_t x)
-{
-	set_dsar(x);
-	set_dcmd(CMMU_DCMD_INV_LINE);
-}
-
-static __inline__ void
-mc88110_inval_data(void)
-{
-	set_dcmd(CMMU_DCMD_INV_ALL);
-}
-
-static __inline__ void
-mc88110_wbinv_data_line(paddr_t x)
-{
-	set_dsar(x);
-	set_dcmd(CMMU_DCMD_WBINV_LINE);
-}
-
-static __inline__ void
-mc88110_wbinv_data_page(paddr_t x)
-{
-	set_dsar(x);
-	set_dcmd(CMMU_DCMD_WBINV_PG);
-}
-
-static __inline__ void
-mc88110_wbinv_data(void)
-{
-	set_dcmd(CMMU_DCMD_WBINV_ALL);
-}
-
-static __inline__ void
-mc88110_inval_inst_line(paddr_t x)
-{
-	set_isar(x);
-	set_icmd(CMMU_ICMD_INV_LINE);
-}
-
-static __inline__ void
-mc88110_inval_inst(void)
-{
-	set_icmd(CMMU_ICMD_INV_ITIC);
-}
-
-/* skip one instruction */
-static __inline__ void
-m88110_skip_insn(struct trapframe *frame)
-{
-	if (frame->tf_exip & 1)
-		frame->tf_exip = frame->tf_enip;
-	else
-		frame->tf_exip += 4;
-}
-
-#endif	/* _LOCORE */
-#endif	/* _MACHINE_M88110_H_ */
diff --git a/sys/arch/mvme88k/include/m8820x.h b/sys/arch/mvme88k/include/m8820x.h
deleted file mode 100644
index ad1e6269cec..00000000000
--- a/sys/arch/mvme88k/include/m8820x.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef	_MACHINE_M8820X_H_
-#define	_MACHINE_M8820X_H_
-/*	$OpenBSD: m8820x.h,v 1.17 2013/11/26 20:33:13 deraadt Exp $ */
-/*
- * Copyright (c) 2004, Miodrag Vallat.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Mach Operating System
- * Copyright (c) 1993-1992 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-/*
- * Code features to enable
- */
-
-#ifdef MVME188
-#define	M88200_HAS_SPLIT_ADDRESS
-#endif
-
-/*
- * Address masks for MVME188 CMMU configs
- */
-
-#define CMMU_SRAM		(1U << 31)
-#define CMMU_A12_MASK		(1U << 12)
-#define CMMU_A14_MASK		(1U << 14)
-#define CMMU_SRAM_MASK		((1U << 31) | (1U << 30))
-
-#include <m88k/m8820x.h>
-
-#endif	/* _MACHINE_M8820X_H_ */
diff --git a/sys/arch/mvme88k/include/m88410.h b/sys/arch/mvme88k/include/m88410.h
deleted file mode 100644
index f52b544c270..00000000000
--- a/sys/arch/mvme88k/include/m88410.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$OpenBSD: m88410.h,v 1.15 2013/02/17 18:10:01 miod Exp $ */
-/*
- * Copyright (c) 2001 Steve Murphree, Jr.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Steve Murphree.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef	_MACHINE_M88410_H_
-#define	_MACHINE_M88410_H_
-
-#ifdef _KERNEL
-
-/*
- *	MC88410 External Cache Controller definitions.
- *	This is only available on MVME197 SP, DP and QP models.
- */
-
-#include <mvme88k/dev/busswreg.h>
-
-void	mc88410_inv(void);
-void	mc88410_wb(void);
-void	mc88410_wbinv(void);
-void	mc88410_wb_page(paddr_t);
-
-static __inline__ int
-mc88410_present(void)
-{
-	return (*(volatile u_int16_t *)(BS_BASE + BS_GCSR)) & BS_GCSR_B410;
-}
-
-#endif	/* _KERNEL */
-
-#endif	/* _MACHINE_M88410_H_ */
diff --git a/sys/arch/mvme88k/include/mioctl.h b/sys/arch/mvme88k/include/mioctl.h
deleted file mode 100644
index e83be7d628a..00000000000
--- a/sys/arch/mvme88k/include/mioctl.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$OpenBSD: mioctl.h,v 1.2 2003/06/02 07:06:56 deraadt Exp $ */
-
-/*
- * Copyright (c) 1995 Theo de Raadt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define MIOCGSIZ		_IOR('m', 1, int)
diff --git a/sys/arch/mvme88k/include/mmu.h b/sys/arch/mvme88k/include/mmu.h
deleted file mode 100644
index 819109fd2f8..00000000000
--- a/sys/arch/mvme88k/include/mmu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: mmu.h,v 1.27 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/mmu.h>
diff --git a/sys/arch/mvme88k/include/mplock.h b/sys/arch/mvme88k/include/mplock.h
deleted file mode 100644
index a4e5204c65c..00000000000
--- a/sys/arch/mvme88k/include/mplock.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$OpenBSD: mplock.h,v 1.2 2007/12/02 21:20:17 miod Exp $	*/
-/* public domain */
-#include <m88k/mplock.h>
diff --git a/sys/arch/mvme88k/include/mutex.h b/sys/arch/mvme88k/include/mutex.h
deleted file mode 100644
index 3c2e77df19b..00000000000
--- a/sys/arch/mvme88k/include/mutex.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: mutex.h,v 1.1 2005/12/03 19:01:15 miod Exp $ */
-/* public domain */
-#include <m88k/mutex.h>
diff --git a/sys/arch/mvme88k/include/mvme181.h b/sys/arch/mvme88k/include/mvme181.h
deleted file mode 100644
index d8140eb1c3d..00000000000
--- a/sys/arch/mvme88k/include/mvme181.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$OpenBSD: mvme181.h,v 1.2 2013/05/23 21:20:12 miod Exp $	*/
-
-/*
- * Copyright (c) 2013 Miodrag Vallat.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _MACHINE_MVME181_H_
-#define _MACHINE_MVME181_H_
-
-#define	M181_OBIO_START	0xffe00000
-
-#define	M181_CMMU_I	0xfff7e000	/* Instruction CMMU address */
-#define	M181_CMMU_D	0xfff7f000	/* Data CMMU address */
-
-#define	M181_SSR	0xffe10000	/* system status register */
-#define	M181_SCR	0xffe20000	/* system control register */
-#define	M181_CPEI	0xffe30000	/* clear parity error interrupt */
-#define	M181_VMEVEC	0xffe80000	/* VME vector register */
-#define	M181_CLRABRT	0xffee0000	/* clear abort interrupt */
-
-#define	M181_DUART	0xffe40000	/* base address of DUART chip */
-#define	M181_DSRTC	0xff810000	/* base address of TODclock */
-
-/*
- * Control and Status Register interrupt bits - 180 only has the lower 8 bits
- */
-
-#define	M181_IRQ_VME4_180	0x0010
-#define	M181_IRQ_PARITY		0x0020	/* 181 only */
-#define	M181_IRQ_DUART		0x0040
-#define	M181_IRQ_ABORT		0x0080
-#define	M181_IRQ_VME1		0x0200
-#define	M181_IRQ_VME2		0x0400
-#define	M181_IRQ_VME3		0x0800
-#define	M181_IRQ_VME4		0x1000
-#define	M181_IRQ_VME5		0x2000
-#define	M181_IRQ_VME6		0x4000
-#define	M181_IRQ_VME7		0x8000
-
-/*
- * System Status register bits (not interrupt bits)
- */
-
-#define	M181_SYSCON		0x0004	/* S3-1 switch closed */
-#define	M181_BOARDMODE		0x0100	/* S3-6 switch closed */
-
-#endif	/* _MACHINE_MVME181_H_ */
diff --git a/sys/arch/mvme88k/include/mvme187.h b/sys/arch/mvme88k/include/mvme187.h
deleted file mode 100644
index cb351584093..00000000000
--- a/sys/arch/mvme88k/include/mvme187.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$OpenBSD: mvme187.h,v 1.11 2013/05/17 22:46:27 miod Exp $ */
-/*
- * Copyright (c) 1996 Nivas Madhur
- * Copyright (c) 1999 Steve Murphree, Jr.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Nivas Madhur.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*
- * Mach Operating System
- * Copyright (c) 1991 Carnegie Mellon University
- * Copyright (c) 1991 OMRON Corporation
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- */
-#ifndef _MACHINE_MVME187_H_
-#define _MACHINE_MVME187_H_
-
-#define BUG187_START	0xff800000	/* start of BUG PROM */
-#define BUG187_SIZE	0x00400000	/* size of BUG PROM */
-#define SRAM_START	0xffe00000	/* start of sram used by bug */
-#define SRAM_SIZE	0x00020000	/* size of sram */
-#define OBIO187_START	0xfff40000	/* start of local IO */
-#define OBIO187_SIZE	0x000b0000	/* size of obio space */
-
-#define SBC_CMMU_I	0xfff77000	/* Single Board Computer code CMMU */
-#define SBC_CMMU_D	0xfff7f000	/* Single Board Computer data CMMU */
-
-#define M187_ILEVEL	0xfff4203e	/* interrupt priority level */
-#define M187_IMASK	0xfff4203f	/* interrupt mask level */
-#define M187_ISRC	0x00000000	/* interrupt mask src (NULL) */
-#define M187_IACK	0xfffe0000	/* interrupt ACK base */
-
-#define MEM_CTLR	0xfff43000	/* MEMC040 mem controller */
-
-#endif	/* _MACHINE_MVME187_H_ */
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
deleted file mode 100644
index 7a7985cfd7a..00000000000
--- a/sys/arch/mvme88k/include/mvme188.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*	$OpenBSD: mvme188.h,v 1.35 2013/05/17 22:46:27 miod Exp $ */
-/*
- * Copyright (c) 1999 Steve Murphree, Jr.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Steve Murphree, Jr.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*
- * Mach Operating System
- * Copyright (c) 1991 Carnegie Mellon University
- * Copyright (c) 1991 OMRON Corporation
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- */
-
-#ifndef	_MACHINE_MVME188_H_
-#define	_MACHINE_MVME188_H_
-
-#define MVME188_EPROM		0xffc00000
-#define MVME188_EPROM_SIZE	0x00080000
-#define MVME188_SRAM		0xffe00000
-#define MVME188_SRAM_SIZE	0x00020000
-#define MVME188_UTILITY		0xfff00000
-#define MVME188_UTILITY_SIZE	0x00090000
-
-/*
- * MVME188 declarations for hardware level device registers and such.
- */
-
-/* per-processor interrupt enable registers */
-#define	MVME188_IENBASE	0xfff84000
-#define MVME188_IEN0	0xfff84004	/* interrupt enable CPU 0 */
-#define MVME188_IEN1	0xfff84008	/* interrupt enable CPU 1 */
-#define MVME188_IEN2	0xfff84010	/* interrupt enable CPU 2 */
-#define MVME188_IEN3	0xfff84020	/* interrupt enable CPU 3 */
-#define	MVME188_IENALL	0xfff8403c	/* simultaneous write */
-#define	MVME188_IEN(cpu)	(MVME188_IENBASE + (4 << (cpu)))
-
-#define MVME188_IST	0xfff84040 	/* interrupt status register */
-
-#define MVME188_SETSWI	0xfff84080 	/* generate soft interrupt */
-#define MVME188_CLRSWI	0xfff84084 	/* reset soft interrupt */
-#define MVME188_ISTATE	0xfff84088 	/* HW interrupt status */
-#define MVME188_CLRINT	0xfff8408c 	/* reset HW interrupt */
-
-#define MVME188_VIRQLV	0xfff85000
-#define	MVME188_VIACK1V	0xfff85004
-#define	MVME188_VIACK2V	0xfff85008
-#define	MVME188_VIACK3V	0xfff8500c
-#define	MVME188_VIACK4V	0xfff85010
-#define	MVME188_VIACK5V	0xfff85014
-#define	MVME188_VIACK6V	0xfff85018
-#define	MVME188_VIACK7V	0xfff8501c
-#define	MVME188_VIRQV	0xfff85020
-#define M188_IVEC		0x40	/* vector returned upon MVME188 int */
-
-#define	MVME188_GLOBAL0	0xfff86001	/* global control and status regs */
-#define	MVME188_GLOBAL1	0xfff86003
-#define	M188_LRST		0x80
-#define	M188_SYSCON		0x40
-#define	MVME188_BRDID	0xfff86005
-#define	MVME188_CGCSR0	0xfff86007
-#define	MVME188_CGCSR1	0xfff86009
-#define	MVME188_CGCSR2	0xfff8600b
-#define	MVME188_CGCSR3	0xfff8600d
-#define	MVME188_CGCSR4	0xfff8600f
-#define MVME188_UCSR	0xfff87000	/* utility control and status reg */
-#define	MVME188_BASAD	0xfff87004	/* base address reg */
-#define MVME188_GLBRES	0xfff8700c	/* global reset reg */
-
-#define MVME188_CCSR	0xfff88000	/* CPU board control status reg */
-#define MVME188_ERROR	0xfff88004	/* Mbus fault reg */
-#define MVME188_PCNFA	0xfff88008	/* Pbus A decoder reg */
-#define MVME188_PCNFB	0xfff8800c	/* Pbus B decoder reg */
-#define MVME188_EXTAD	0xfff88010	/* A24 master A24-A31 addr reg */
-#define MVME188_WHOAMI	0xfff88018	/* whoami reg */
-#define MVME188_WMAD	0xfff88020	/* write mbus addr decoder reg */
-#define MVME188_RMAD	0xfff88024	/* read mbus addr decoder reg */
-#define MVME188_WVAD	0xfff88028	/* write vmebus addr decoder reg */
-#define MVME188_RVAD	0xfff8802c	/* read vmebus adds decoder reg */
-
-/*
- * IEN and IST register bits
- * Refer to MVME188 RISC Microcomputer User's Manual, table 4.3
- */
-
-#define IRQ_ABORT		0x80000000	/* 31 */
-#define IRQ_ACF			0x40000000	/* 30 */
-#define IRQ_ARBTO		0x20000000	/* 29 */
-#define IRQ_DTI			0x10000000	/* 28 */
-#define IRQ_SWI7		0x08000000	/* 27 */
-#define IRQ_SWI6		0x04000000	/* 26 */
-#define IRQ_SWI5		0x02000000	/* 25 */
-#define IRQ_SWI4		0x01000000	/* 24 */
-#define IRQ_VME7		0x00800000	/* 23 */
-#define IRQ_CIOI		0x00200000	/* 21 */
-#define IRQ_SF			0x00100000	/* 20 */
-#define IRQ_VME6		0x00080000	/* 19 */
-#define IRQ_DI			0x00020000	/* 17 */
-#define IRQ_SIGHPI		0x00010000	/* 16 */
-#define IRQ_VME5		0x00004000	/* 14 */
-#define IRQ_VME4		0x00001000	/* 12 */
-#define IRQ_VME3		0x00000400	/* 10 */
-#define IRQ_LMI			0x00000100	/* 08 */
-#define IRQ_SIGLPI		0x00000080	/* 07 */
-#define IRQ_VME2		0x00000040	/* 06 */
-#define IRQ_VME1		0x00000010	/* 04 */
-#define IRQ_SWI3		0x00000008	/* 03 */
-#define IRQ_SWI2		0x00000004	/* 02 */
-#define IRQ_SWI1		0x00000002	/* 01 */
-#define IRQ_SWI0		0x00000001	/* 00 */
-
-#define IST_STRING	"\20" \
-	"\40ABRT\37ACF\36ARBTO\35DTI\34SWI7\33SWI6\32SWI5\31SWI4" \
-	"\30IRQ7\26CIOI\25SF\24IRQ6\22DI\21SIGHPI" \
-	"\17IRQ5\15IRQ4\13IRQ3\11LMI" \
-	"\10SIGLPI\7IRQ2\5IRQ1\4SWI3\3SWI2\2SWI1\1SWI0"
-
-/* IPI bits (see below) */
-#define	CLOCK_IPI_MASK		(IRQ_SWI7 | IRQ_SWI6 | IRQ_SWI5 | IRQ_SWI4)
-#define	IPI_MASK		(IRQ_SWI3 | IRQ_SWI2 | IRQ_SWI1 | IRQ_SWI0)
-
-#define ISR_GET_CURRENT_MASK(cpu) \
-	(*(volatile u_int *)MVME188_IST & int_mask_reg[cpu])
-
-/*
- * Software interrupts 0 to 3, and 4 to 7, are used to deliver IPIs to cpu0-3.
- * We use two bits because we want clock ipis to be maskable.
- * We rely on the fact that the control bits for these interrupts are
- * the same in the interrupt registers and the set/clear SWI registers.
- */
-/* values for SETSWI and CLRSWI registers */
-#define	SWI_IPI_BIT(cpuid)		(0x01 << (cpuid))
-#define	SWI_CLOCK_IPI_BIT(cpuid)	(0x10 << (cpuid))
-/* values for IEN and IST registers */
-#define	SWI_IPI_MASK(cpuid)		(IRQ_SWI0 << (cpuid))
-#define	SWI_CLOCK_IPI_MASK(cpuid)	(IRQ_SWI4 << (cpuid))
-
-/*
- * ISTATE and CLRINT register bits
- */
-
-#define ISTATE_ABORT		0x04
-#define	ISTATE_ACFAIL		0x02
-#define	ISTATE_SYSFAIL		0x01
-
-/*
- * UCSR register bits
- */
-
-#define UCSR_PWRUPBIT 	0x00004000	/* powerup indicator */
-#define UCSR_DRVSFBIT 	0x00002000	/* Board system fail */
-#define UCSR_BRIRQBIT 	0x00001000	/* drives VME IRQ1 broadcast int */
-#define UCSR_ROBINBIT 	0x00000800	/* sel round robin VME arbiter mode */
-#define UCSR_BRLVBITS 	0x00000600	/* VME bus request level 0-3 */
-#define UCSR_RNEVERBIT  0x00000100	/* VME bus never release once req'd */
-#define UCSR_RONRBIT	0x00000080	/* VME bus req release on no request */
-#define UCSR_RWDBIT	0x00000040	/* VME bus request release when done */
-#define UCSR_EARBTOBIT  0x00000020	/* enable VME arbiter bus timeout */
-#define VTOSELBITS	0x00000018	/* VMEbus timeout select bits */
-#define VTO32US			0x00	/* 32 usec */
-#define VTO64US			0x01	/* 64 usec */
-#define VTO128US		0x10	/* 128 usec */
-#define VTODISABLE		0x18	/* disabled */
-
-/* these are the various Z8536 CIO counter/timer registers */
-#define CIO_BASE		0xfff83000
-#define CIO_PORTC		0xfff83000
-#define CIO_PORTB		0xfff83004
-#define CIO_PORTA		0xfff83008
-#define CIO_CTRL		0xfff8300c
-
-#define DART_BASE		0xfff82000
-
-/*
- * HYPERmodule CMMU addresses
- */
-
-#define VME_CMMU_I0	0xfff7e000
-#define VME_CMMU_I1	0xfff7d000
-#define VME_CMMU_I2	0xfff7b000
-#define VME_CMMU_I3	0xfff77000
-#define VME_CMMU_D0	0xfff6f000
-#define VME_CMMU_D1	0xfff5f000
-#define VME_CMMU_D2	0xfff3f000
-#define VME_CMMU_D3	0xfff7f000
-
-#endif	/* _MACHINE_MVME188_H_ */
diff --git a/sys/arch/mvme88k/include/mvme197.h b/sys/arch/mvme88k/include/mvme197.h
deleted file mode 100644
index ae6c5ab6787..00000000000
--- a/sys/arch/mvme88k/include/mvme197.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$OpenBSD: mvme197.h,v 1.12 2011/03/23 16:54:36 pirofti Exp $ */
-/*
- * Copyright (c) 1996 Nivas Madhur
- * Copyright (c) 1999 Steve Murphree, Jr.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Nivas Madhur.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*
- * Mach Operating System
- * Copyright (c) 1991 Carnegie Mellon University
- * Copyright (c) 1991 OMRON Corporation
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- */
-#ifndef _MACHINE_MVME197_H_
-#define _MACHINE_MVME197_H_
-
-#define	ECDM_BASE	0xfff01100	/* not what the doc says... */
-
-#define	FLASH_START	0xff800000	/* start of flash memory area */
-#define	FLASH_SIZE	0x00400000
-#define BUG197_START	0xfff80000	/* start of BUG PROM (in OBIO) */
-#define BUG197_SIZE	0x00040000
-#define OBIO197_START	0xfff00000	/* start of local IO */
-#define OBIO197_SIZE	0x000d0000	/* size of obio space */
-
-#define M197_ILEVEL	0xfff00064	/* interrupt priority level */
-#define M197_IMASK	0xfff00065	/* interrupt mask level */
-#define M197_ISRC	0xfff0006f	/* interrupt SRC */
-#define M197_IACK	0xfff00100	/* interrupt ACK base */
-
-#ifdef _KERNEL
-void	m197_broadcast_complex_ipi(int, u_int32_t, u_int32_t);
-void	m197_send_complex_ipi(int, cpuid_t, u_int32_t, u_int32_t);
-void	m197_send_ipi(int, cpuid_t);
-#endif
-
-#endif	/* _MACHINE_MVME197_H_ */
diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h
deleted file mode 100644
index 4f049bfc509..00000000000
--- a/sys/arch/mvme88k/include/param.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$OpenBSD: param.h,v 1.43 2013/11/02 23:06:18 miod Exp $ */
-
-/*
- * Copyright (c) 1999 Steve Murphree, Jr.
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef	_MACHINE_PARAM_H_
-#define	_MACHINE_PARAM_H_
-
-#define	_MACHINE       mvme88k
-#define	MACHINE        "mvme88k"
-
-#include <m88k/param.h>
-
-/*
- * The Bug uses the bottom 64KB. The kernel will allocate PTEs to map this
- * space, but the kernel must be linked with a start address past these 64KB.
- */
-#define	KERNBASE	0x00000000	/* start of kernel virtual */
-#define	KERNTEXTOFF	0x00080000	/* start of kernel text */
-
-#if defined(_KERNEL) || defined(_STANDALONE)
-#if !defined(_LOCORE)
-extern int brdtyp;
-#endif
-
-/*
- * Values for the brdtyp variable.
- */
-#define BRD_180		0x180
-#define BRD_181		0x181
-#define BRD_187		0x187
-#define BRD_188		0x188
-#define BRD_197		0x197
-#define BRD_8120	0x8120
-
-#endif	/* _KERNEL || _STANDALONE */
-
-#endif /* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/mvme88k/include/pcb.h b/sys/arch/mvme88k/include/pcb.h
deleted file mode 100644
index 8cf38671aca..00000000000
--- a/sys/arch/mvme88k/include/pcb.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: pcb.h,v 1.15 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/pcb.h>
diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h
deleted file mode 100644
index dfd79a91c1d..00000000000
--- a/sys/arch/mvme88k/include/pmap.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: pmap.h,v 1.37 2010/12/31 21:38:08 miod Exp $ */
-/* public domain */
-#include <m88k/pmap.h>
diff --git a/sys/arch/mvme88k/include/pmap_table.h b/sys/arch/mvme88k/include/pmap_table.h
deleted file mode 100644
index 327226180d3..00000000000
--- a/sys/arch/mvme88k/include/pmap_table.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: pmap_table.h,v 1.11 2004/07/25 11:06:42 miod Exp $ */
-/* public domain */
-#include <m88k/pmap_table.h>
diff --git a/sys/arch/mvme88k/include/proc.h b/sys/arch/mvme88k/include/proc.h
deleted file mode 100644
index 910c7313af5..00000000000
--- a/sys/arch/mvme88k/include/proc.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: proc.h,v 1.13 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/proc.h>
diff --git a/sys/arch/mvme88k/include/profile.h b/sys/arch/mvme88k/include/profile.h
deleted file mode 100644
index ca0038ffaac..00000000000
--- a/sys/arch/mvme88k/include/profile.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: profile.h,v 1.15 2004/04/29 06:25:36 miod Exp $ */
-/* public domain */
-#include <m88k/profile.h>
diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h
deleted file mode 100644
index d18c790749b..00000000000
--- a/sys/arch/mvme88k/include/prom.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*	$OpenBSD: prom.h,v 1.21 2013/05/14 20:30:47 miod Exp $ */
-/*
- * Copyright (c) 1998 Steve Murphree, Jr.
- * Copyright (c) 1996 Nivas Madhur
- * Copyright (c) 1995 Theo de Raadt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _MACHINE_PROM_H_
-#define _MACHINE_PROM_H_
-
-/* BUG trap vector */
-#define	MVMEPROM_VECTOR		496
-
-#define MVMEPROM_INCHR		0x00
-#define MVMEPROM_INSTAT		0x01
-#define MVMEPROM_INLN		0x02
-#define MVMEPROM_READSTR	0x03
-#define MVMEPROM_READLN		0x04
-#define MVMEPROM_DSKRD		0x10
-#define MVMEPROM_DSKWR		0x11
-#define MVMEPROM_DSKCFIG	0x12
-#define MVMEPROM_DSKFMT		0x14
-#define MVMEPROM_DSKCTRL	0x15
-#define MVMEPROM_NETCFIG	0x1a
-#define MVMEPROM_NETFOPEN	0x1b
-#define MVMEPROM_NETFREAD	0x1c
-#define MVMEPROM_NETCTRL	0x1d
-#define MVMEPROM_OUTCHR		0x20
-#define MVMEPROM_OUTSTR		0x21
-#define MVMEPROM_OUTSTRCRLF	0x22
-#define MVMEPROM_WRITE		0x23
-#define MVMEPROM_WRITELN	0x24
-#define	MVMEPROM_OUTCRLF	0x26	/* not implemented on MVME181? */
-#define MVMEPROM_DELAY		0x43
-#define MVMEPROM_RTC_RD		0x53
-#define MVMEPROM_EXIT		0x63
-#define MVMEPROM_GETBRDID	0x70
-#define MVMEPROM_ENVIRON	0x71
-#define	MVMEPROM_FORKMPU	0x100
-
-#define	NETCFIG_READ		1
-#define	NETCFIG_WRITE		2
-#define	NETCFIG_STORE		4
-
-#define NETCTRLCMD_INITIALIZE	0
-#define NETCTRLCMD_GETETHER	1
-#define NETCTRLCMD_XMIT		2
-#define NETCTRLCMD_RECV		3
-#define NETCTRLCMD_FLUSH	4
-#define NETCTRLCMD_RESET	5
-
-#define ENVIRONCMD_WRITE	1
-#define ENVIRONCMD_READ		2
-#define ENVIRONTYPE_EOL		0
-#define ENVIRONTYPE_START	1
-#define ENVIRONTYPE_DISKBOOT	2
-#define ENVIRONTYPE_ROMBOOT	3
-#define ENVIRONTYPE_NETBOOT	4
-#define ENVIRONTYPE_MEMSIZE	5
-
-#define	FORKMPU_NOT_IDLE	-1
-#define	FORKMPU_BAD_ADDRESS	-2
-#define	FORKMPU_NO_MPU		-3
-
-#ifndef LOCORE
-struct mvmeprom_netcfig {
-	u_char	ctrl;
-	u_char	dev;
-	u_short	status;
-	u_long	ncp_addr;
-	u_long	dcp_addr;
-	u_long	flags;
-};
-
-struct mvmeprom_ncp {
-	u_long	magic;
-#define	NETCFIG_MAGIC	0x12301983
-	u_long	node_memory_address;
-	u_long	boot_load_address;
-	u_long	boot_start_address;
-	u_long	boot_start_delay;
-	u_long	boot_length;
-	u_long	boot_offset;
-	u_long	trace_buffer_address;
-	u_long	client_ip;
-	u_long	server_ip;
-	u_long	subnet_mask;
-	u_long	broadcast_mask;
-	u_long	gateway_ip;
-	u_char	bootp_retry;
-	u_char	tftp_retry;
-	char	rarp_control;
-	char	update_control;
-	char	filename[64];
-	char	commandline[64];
-};
-
-struct mvmeprom_netctrl {
-	u_char	ctrl;
-	u_char	dev;
-	u_short	status;
-	u_long	cmd;
-	u_long	addr;
-	u_long	len;
-	u_long	flags;
-};
-
-struct mvmeprom_netfopen {
-	u_char	ctrl;
-	u_char	dev;
-	u_short	status;
-	char	filename[64];
-};
-
-struct mvmeprom_netfread {
-	u_char	ctrl;
-	u_char	dev;
-	u_short	status;
-	u_long	addr;
-	u_short	bytes;
-	u_short	blk;
-	u_long	timeout;
-};
-
-struct prom_environ_hdr {
-	u_char	type;
-	u_char	len;
-};
-
-struct mvmeprom_brdid {
-	u_long	eye_catcher;
-	u_char	rev;
-	u_char	month;
-	u_char	day;
-	u_char	year;
-	u_short	size;
-	u_short	rsv1;
-	u_short	model;
-	u_char	suffix[2];
-	u_short	options;
-	u_char	family;
-	u_char	cpu;
-	u_short	ctrlun;
-	u_short	devlun;
-	u_short	devtype;
-	u_short	devnum;
-	u_long	bug;
-	u_char	version[4];
-	u_char	serial[12];		/* SBC serial number */
-	u_char	id[16];			/* SBC id */
-	u_char	pwa[16];		/* printed wiring assembly number */
-	u_char	speed[4];		/* cpu speed */
-	u_char	etheraddr[6];		/* mac address, all zero if no ether */
-	u_char	fill[2];
-	u_char	scsiid[2];		/* local SCSI id */
-	u_char	sysid[8];		/* system id - nothing on mvme187 */
-	u_char	brd1_pwb[8];		/* memory board 1 pwb */
-	u_char	brd1_serial[8];		/* memory board 1 serial */
-	u_char	brd2_pwb[8];		/* memory board 2 pwb */
-	u_char	brd2_serial[8];		/* memory board 2 serial */
-	u_char	reserved[153];
-	u_char	cksum[1];
-};
-
-struct mvmeprom_time {
-        u_char	year_BCD;
-        u_char	month_BCD;
-        u_char	day_BCD;
-        u_char	wday_BCD;
-        u_char	hour_BCD;
-        u_char	min_BCD;
-        u_char	sec_BCD;
-        u_char	cal_BCD;
-};
-
-struct mvmeprom_dskio {
-	u_char	ctrl_lun;
-	u_char	dev_lun;
-	u_short	status;
-	void	*pbuffer;
-	u_long	blk_num;
-	u_short	blk_cnt;
-	u_char	flag;
-#define BUG_FILE_MARK	0x80
-#define IGNORE_FILENUM	0x02
-#define END_OF_FILE	0x01
-	u_char	addr_mod;
-};
-#define MVMEPROM_BLOCK_SIZE	256
-
-#endif	/* _LOCORE */
-
-#ifndef RB_NOSYM
-#define RB_NOSYM 0x4000
-#endif
-#endif /* _MACHINE_PROM_H_ */
diff --git a/sys/arch/mvme88k/include/psl.h b/sys/arch/mvme88k/include/psl.h
deleted file mode 100644
index 03f15339aac..00000000000
--- a/sys/arch/mvme88k/include/psl.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: psl.h,v 1.16 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/psl.h>
diff --git a/sys/arch/mvme88k/include/ptrace.h b/sys/arch/mvme88k/include/ptrace.h
deleted file mode 100644
index f318109f264..00000000000
--- a/sys/arch/mvme88k/include/ptrace.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: ptrace.h,v 1.12 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/ptrace.h>
diff --git a/sys/arch/mvme88k/include/reg.h b/sys/arch/mvme88k/include/reg.h
deleted file mode 100644
index 491bed27782..00000000000
--- a/sys/arch/mvme88k/include/reg.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: reg.h,v 1.16 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/reg.h>
diff --git a/sys/arch/mvme88k/include/reloc.h b/sys/arch/mvme88k/include/reloc.h
deleted file mode 100644
index 689cda8e0ca..00000000000
--- a/sys/arch/mvme88k/include/reloc.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: reloc.h,v 1.1 2013/01/05 11:20:56 miod Exp $ */
-/* public domain */
-#include <m88k/reloc.h>
diff --git a/sys/arch/mvme88k/include/setjmp.h b/sys/arch/mvme88k/include/setjmp.h
deleted file mode 100644
index e3834ebb05a..00000000000
--- a/sys/arch/mvme88k/include/setjmp.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: setjmp.h,v 1.9 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/setjmp.h>
diff --git a/sys/arch/mvme88k/include/signal.h b/sys/arch/mvme88k/include/signal.h
deleted file mode 100644
index 016c5a31574..00000000000
--- a/sys/arch/mvme88k/include/signal.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: signal.h,v 1.14 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/signal.h>
diff --git a/sys/arch/mvme88k/include/spinlock.h b/sys/arch/mvme88k/include/spinlock.h
deleted file mode 100644
index 4686657622e..00000000000
--- a/sys/arch/mvme88k/include/spinlock.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: spinlock.h,v 1.3 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/spinlock.h>
diff --git a/sys/arch/mvme88k/include/stdarg.h b/sys/arch/mvme88k/include/stdarg.h
deleted file mode 100644
index 14940e14a9d..00000000000
--- a/sys/arch/mvme88k/include/stdarg.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: stdarg.h,v 1.8 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/stdarg.h>
diff --git a/sys/arch/mvme88k/include/tcb.h b/sys/arch/mvme88k/include/tcb.h
deleted file mode 100644
index 9b8af0732f6..00000000000
--- a/sys/arch/mvme88k/include/tcb.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$OpenBSD: tcb.h,v 1.2 2013/06/01 21:20:54 jasper Exp $	*/
-/* public domain */
-#include <m88k/tcb.h>
diff --git a/sys/arch/mvme88k/include/trap.h b/sys/arch/mvme88k/include/trap.h
deleted file mode 100644
index b8490824bfa..00000000000
--- a/sys/arch/mvme88k/include/trap.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $OpenBSD: trap.h,v 1.25 2013/05/17 22:46:28 miod Exp $ */
-/* public domain */
-#include <machine/board.h>	/* md_interrupt_func */
-#include <m88k/trap.h>
diff --git a/sys/arch/mvme88k/include/varargs.h b/sys/arch/mvme88k/include/varargs.h
deleted file mode 100644
index 330ab175540..00000000000
--- a/sys/arch/mvme88k/include/varargs.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: varargs.h,v 1.9 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/varargs.h>
diff --git a/sys/arch/mvme88k/include/vmparam.h b/sys/arch/mvme88k/include/vmparam.h
deleted file mode 100644
index 4641c603e43..00000000000
--- a/sys/arch/mvme88k/include/vmparam.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $OpenBSD: vmparam.h,v 1.28 2010/12/31 21:38:08 miod Exp $ */
-/* public domain */
-
-/*
- * Physical memory is mapped 1:1 at the bottom of the supervisor address
- * space. Kernel virtual memory space starts from the end of physical memory,
- * up to the on-board devices appearing all over the last 8MB of address space.
- */
-#define VM_MIN_KERNEL_ADDRESS	((vaddr_t)0x00000000)
-#define VM_MAX_KERNEL_ADDRESS	((vaddr_t)0xff800000)
-
-#include <m88k/vmparam.h>