More include files cleaning:

- move MAX_CPUS constant to <machine/cpu.h>
- do not include <machine/board.h> unless needed. In fact, remove this file
  entirely on mvme88k, and include <machine/mvme*.h> on a
  compiling-for-this-board basis
- keep MAX_CMMUS constant private to the m8820x code

26 files changed, 93 insertions, 143 deletions

diff --git a/sys/arch/luna88k/luna88k/eh.S b/sys/arch/luna88k/luna88k/eh.S
index 4c7446611d0..11d35912b85 100644
--- a/sys/arch/luna88k/luna88k/eh.S
+++ b/sys/arch/luna88k/luna88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.2 2004/07/27 12:16:04 miod Exp $   */
+/*   $OpenBSD: eh.S,v 1.3 2004/08/02 08:34:57 miod Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -28,6 +28,8 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/board.h>
+
 /*
  * Save Pbus fault status register from data and inst CMMU.
  */
diff --git a/sys/arch/luna88k/luna88k/m8820x.c b/sys/arch/luna88k/luna88k/m8820x.c
index cf53b7e6d5a..29ff7989def 100644
--- a/sys/arch/luna88k/luna88k/m8820x.c
+++ b/sys/arch/luna88k/luna88k/m8820x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.c,v 1.2 2004/05/07 18:06:39 miod Exp $	*/
+/*	$OpenBSD: m8820x.c,v 1.3 2004/08/02 08:34:57 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -209,6 +209,8 @@ struct m8820x_cmmu {
  * Structure for accessing MMUS properly
  */
 
+#define MAX_CMMUS	(2 * MAX_CPUS)		/* maximum cmmus on the board */
+
 struct m8820x_cmmu m8820x_cmmu[MAX_CMMUS] =
 {
 	/* address, cpu, mode, access, alive, addr, mask */
diff --git a/sys/arch/m88k/include/cmmu.h b/sys/arch/m88k/include/cmmu.h
index d9bce283e64..72da0e1d2a4 100644
--- a/sys/arch/m88k/include/cmmu.h
+++ b/sys/arch/m88k/include/cmmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.h,v 1.2 2004/05/07 18:06:39 miod Exp $ */
+/*	$OpenBSD: cmmu.h,v 1.3 2004/08/02 08:34:59 miod Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -25,12 +25,12 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	_MACHINE_CMMU_H_
-#define	_MACHINE_CMMU_H_
+#ifndef	_M88K_CMMU_H_
+#define	_M88K_CMMU_H_
 
 #include <machine/mmu.h>
 
-#ifndef	_LOCORE
+#if defined(_KERNEL) && !defined(_LOCORE)
 /*
  * Prototypes and stuff for cmmu.c.
  */
@@ -99,6 +99,6 @@ extern struct cmmu_p *cmmu;
 #define	cmmu_show_translation(a, b, c, d)	(cmmu->cmmu_show_translation_func)(a, b, c, d)
 #define show_apr(ap)		(cmmu->show_apr_func)(ap)
 
-#endif	/* _LOCORE */
+#endif	/* _KERNEL && !_LOCORE */
 
-#endif	/* _MACHINE_CMMU_H_ */
+#endif	/* _M88K_CMMU_H_ */
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index fafb2ea1cff..8e34d692561 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.3 2004/07/24 15:05:05 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.4 2004/08/02 08:34:59 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -54,9 +54,12 @@
 
 #ifdef _KERNEL
 
-#include <machine/psl.h>
+#ifndef	MAX_CPUS
+#define	MAX_CPUS	4
+#endif
+
 #include <machine/pcb.h>
-#include <machine/board.h>
+#include <machine/psl.h>
 
 /*
  * definitions of cpu-dependent requirements
diff --git a/sys/arch/m88k/m88k/eh_common.S b/sys/arch/m88k/m88k/eh_common.S
index fff90932f74..7ab4a8053ff 100644
--- a/sys/arch/m88k/m88k/eh_common.S
+++ b/sys/arch/m88k/m88k/eh_common.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh_common.S,v 1.3 2004/07/28 12:28:48 miod Exp $	*/
+/*   $OpenBSD: eh_common.S,v 1.4 2004/08/02 08:34:59 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -207,7 +207,6 @@
 
 #include <machine/param.h>
 #include <machine/asm.h>
-#include <machine/board.h>
 #ifdef MVME188
 #include <machine/m8820x.h>
 #endif
diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c
index f3095b8aa5b..9e5e429bacf 100644
--- a/sys/arch/m88k/m88k/pmap.c
+++ b/sys/arch/m88k/m88k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.2 2004/07/26 11:08:20 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.3 2004/08/02 08:34:59 miod Exp $	*/
 /*
  * Copyright (c) 2001-2004, Miodrag Vallat
  * Copyright (c) 1998-2001 Steve Murphree, Jr.
@@ -57,7 +57,6 @@
 #include <uvm/uvm.h>
 
 #include <machine/asm_macro.h>
-#include <machine/board.h>
 #include <machine/cmmu.h>
 #include <machine/cpu_number.h>
 #include <machine/pmap_table.h>
diff --git a/sys/arch/m88k/m88k/vm_machdep.c b/sys/arch/m88k/m88k/vm_machdep.c
index 5066f5a50aa..c028028b292 100644
--- a/sys/arch/m88k/m88k/vm_machdep.c
+++ b/sys/arch/m88k/m88k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.1 2004/07/23 15:34:03 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.2 2004/08/02 08:35:00 miod Exp $	*/
 
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -57,7 +57,6 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/mmu.h>
-#include <machine/board.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
 #include <machine/cpu_number.h>
diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c
index 01ea15b533c..3a1fb7e2abe 100644
--- a/sys/arch/mvme88k/dev/clock.c
+++ b/sys/arch/mvme88k/dev/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.34 2004/07/30 22:09:59 miod Exp $ */
+/*	$OpenBSD: clock.c,v 1.35 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1995 Theo de Raadt
@@ -77,7 +77,6 @@
 #include <sys/systm.h>
 
 #include <machine/asm.h>
-#include <machine/board.h>	/* for register defines */
 #include <machine/psl.h>
 #include <machine/autoconf.h>
 #include <machine/bugio.h>
@@ -86,12 +85,14 @@
 
 #include "pcctwo.h"
 #if NPCCTWO > 0
+#include <machine/mvme1x7.h>
 #include <mvme88k/dev/pcctwovar.h>
 #include <mvme88k/dev/pcctworeg.h>
 #endif
 
 #include "syscon.h"
 #if NSYSCON > 0
+#include <machine/mvme188.h>
 #include <mvme88k/dev/sysconreg.h>
 #endif
 
diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c
index 09bcbfaf59b..48f611842bf 100644
--- a/sys/arch/mvme88k/dev/dart.c
+++ b/sys/arch/mvme88k/dev/dart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dart.c,v 1.38 2004/07/31 22:26:27 miod Exp $	*/
+/*	$OpenBSD: dart.c,v 1.39 2004/08/02 08:35:00 miod Exp $	*/
 
 /*
  * Mach Operating System
@@ -47,6 +47,7 @@
 
 #include <dev/cons.h>
 
+#include <machine/mvme188.h>
 #include <mvme88k/dev/sysconreg.h>
 #include <mvme88k/dev/dartreg.h>
 
diff --git a/sys/arch/mvme88k/dev/if_ie.c b/sys/arch/mvme88k/dev/if_ie.c
index e93398a3a83..6651cbda9f1 100644
--- a/sys/arch/mvme88k/dev/if_ie.c
+++ b/sys/arch/mvme88k/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.30 2004/07/30 19:02:05 miod Exp $ */
+/*	$OpenBSD: if_ie.c,v 1.31 2004/08/02 08:35:00 miod Exp $ */
 
 /*-
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -129,7 +129,6 @@ Mode of operation:
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
-#include <machine/board.h>
 #include <machine/cpu.h>
 #include <machine/pmap.h>
 
diff --git a/sys/arch/mvme88k/dev/mainbus.c b/sys/arch/mvme88k/dev/mainbus.c
index b13ed5a0060..a394254f76d 100644
--- a/sys/arch/mvme88k/dev/mainbus.c
+++ b/sys/arch/mvme88k/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.12 2004/05/07 18:10:28 miod Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.13 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 2004, Miodrag Vallat.
@@ -34,10 +34,16 @@
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
-#include <machine/board.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
 
+#ifdef MVME188
+#include <machine/mvme188.h>
+#endif
+#if defined(MVME187) || defined(MVME197)
+#include <machine/mvme1x7.h>
+#endif
+
 void	mainbus_attach(struct device *, struct device *, void *);
 int 	mainbus_match(struct device *, void *, void *);
 int	mainbus_print(void *, const char *);
diff --git a/sys/arch/mvme88k/dev/syscon.c b/sys/arch/mvme88k/dev/syscon.c
index 2864afe0466..4c74cccebec 100644
--- a/sys/arch/mvme88k/dev/syscon.c
+++ b/sys/arch/mvme88k/dev/syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscon.c,v 1.21 2004/07/30 19:02:06 miod Exp $ */
+/*	$OpenBSD: syscon.c,v 1.22 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -36,9 +36,9 @@
 
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
-#include <machine/board.h>
 #include <machine/frame.h>
 
+#include <machine/mvme188.h>
 #include <mvme88k/dev/sysconreg.h>
 
 struct sysconsoftc {
diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c
index cc1f4136944..80ac43dddd2 100644
--- a/sys/arch/mvme88k/dev/vme.c
+++ b/sys/arch/mvme88k/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.38 2004/07/30 19:02:06 miod Exp $ */
+/*	$OpenBSD: vme.c,v 1.39 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -45,6 +45,7 @@
 
 #include <mvme88k/dev/vme.h>
 #if NSYSCON > 0
+#include <machine/mvme188.h>
 #include <mvme88k/dev/sysconreg.h>
 #endif
 
diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h
deleted file mode 100644
index fe1a5848257..00000000000
--- a/sys/arch/mvme88k/include/board.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$OpenBSD: board.h,v 1.20 2004/01/19 17:21:23 miod Exp $ */
-/*
- * 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.
- *
- */
-/*
- * 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_BOARD_H__
-#define __MACHINE_BOARD_H__
-
-#define MAX_CPUS	4	/* maximum number of CPUs */
-#define MAX_CMMUS	8	/* maximum number of CMMUs */
-
-#define MAXPHYSMEM	0x30000000	/* maximum physical memory (768MB) */
-
-/* Board-dependent definitions */
-
-#if defined(MVME187) || defined(MVME197)
-#include <machine/mvme1x7.h>
-#endif
-#ifdef MVME187
-#include <machine/mvme187.h>
-#endif
-#ifdef MVME188
-#include <machine/mvme188.h>
-#endif
-#ifdef MVME197
-#include <machine/mvme197.h>
-#endif
-
-#endif /* __MACHINE_BOARD_H__ */
diff --git a/sys/arch/mvme88k/include/m8820x.h b/sys/arch/mvme88k/include/m8820x.h
index 4aee195eaa2..4b881800351 100644
--- a/sys/arch/mvme88k/include/m8820x.h
+++ b/sys/arch/mvme88k/include/m8820x.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.h,v 1.13 2004/04/26 12:34:05 miod Exp $ */
+/*	$OpenBSD: m8820x.h,v 1.14 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -59,16 +59,3 @@
 #define CMMU_A12_MASK		(1 << 12)
 #define CMMU_A14_MASK		(1 << 14)
 #define CMMU_SRAM_MASK		((1 << 31) | (1 << 30))
-
-/*
- * 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
diff --git a/sys/arch/mvme88k/include/mvme187.h b/sys/arch/mvme88k/include/mvme187.h
index 3fd066ba954..3be1863a99d 100644
--- a/sys/arch/mvme88k/include/mvme187.h
+++ b/sys/arch/mvme88k/include/mvme187.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme187.h,v 1.5 2003/09/16 20:52:19 miod Exp $ */
+/*	$OpenBSD: mvme187.h,v 1.6 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -45,10 +45,6 @@
  */
 #ifndef __MACHINE_MVME187_H__
 #define __MACHINE_MVME187_H__
-/*
- *      MVME187 CPU board constants - derived from Luna88k
- *      This file is included from <machine/board.h>
- */
 
 #define BUG187_START	0xFF800000	/* start of BUG PROM */
 #define BUG187_SIZE	0x003FFFFF	/* size of BUG PROM */
@@ -63,4 +59,6 @@
 #define M187_ISRC	0x00000000	/* interrupt mask src (NULL) */
 #define M187_IACK	0xFFFE0000	/* interrupt ACK base */
 
+#include <machine/mvme1x7.h>
+
 #endif	/* __MACHINE_MVME187_H__ */
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index 605507923c2..f13da69f39f 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.18 2004/07/23 22:19:09 miod Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.19 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -350,12 +350,21 @@
 #define DART_OPRS		0xfff82038	/* output port set */
 #define DART_OPRR		0xfff8203c	/* output port reset */
 
-#ifndef _LOCORE
-
 /*
- * Externals
+ * 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
+
+#ifndef _LOCORE
+
 extern unsigned int m188_curspl[MAX_CPUS];
 extern unsigned int int_mask_val[INT_LEVEL];
 extern unsigned int int_mask_shadow[MAX_CPUS];
diff --git a/sys/arch/mvme88k/include/mvme197.h b/sys/arch/mvme88k/include/mvme197.h
index 58781931f2d..fe8f5392d33 100644
--- a/sys/arch/mvme88k/include/mvme197.h
+++ b/sys/arch/mvme88k/include/mvme197.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme197.h,v 1.4 2003/09/16 20:52:19 miod Exp $ */
+/*	$OpenBSD: mvme197.h,v 1.5 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -46,11 +46,6 @@
 #ifndef __MACHINE_MVME197_H__
 #define __MACHINE_MVME197_H__
 
-/*
- *      MVME197 CPU board constants - derived from Luna88k
- *      This file is included from <machine/board.h>
- */
-
 #define	FLASH_START	0xFF800000	/* start of flash memory area */
 #define	FLASH_SIZE	0x003FFFFF
 #define BUG197_START	0xFFF80000	/* start of BUG PROM (in OBIO) */
@@ -61,4 +56,6 @@
 #define M197_ISRC	0xFFF0006F	/* interrupt SRC */
 #define M197_IACK	0xFFF00100	/* interrupt ACK base */
 
+#include <machine/mvme1x7.h>
+
 #endif	/* __MACHINE_MVME197_H__ */
diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h
index 29bb00a4c60..1000df89252 100644
--- a/sys/arch/mvme88k/include/mvme1x7.h
+++ b/sys/arch/mvme88k/include/mvme1x7.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme1x7.h,v 1.10 2003/09/16 20:52:19 miod Exp $ */
+/*	$OpenBSD: mvme1x7.h,v 1.11 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -46,10 +46,6 @@
 #ifndef __MACHINE_MVME1X7_H__
 #define __MACHINE_MVME1X7_H__
 
-/*
- *      VME1x7 CPU board constants - derived from Luna88k
- */
-
 #define OBIO_START	0xFFF00000	/* start of local IO */
 #define OBIO_SIZE	0x000EFFFF	/* size of obio space */
 
diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index 4a7361ff507..21219937ead 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.57 2004/07/27 12:16:06 miod Exp $   */
+/*   $OpenBSD: eh.S,v 1.58 2004/08/02 08:35:00 miod Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -34,6 +34,7 @@
 
 /* Single-processor SBC version (MVME187, MVME8120) */
 #ifdef MVME187
+#include <machine/mvme187.h>
 #define	PFSR_SAVE_187 \
 	or.u	TMP,  r0,   hi16(SBC_CMMU_I); \
 	ld	TMP2, TMP,  lo16(SBC_CMMU_I) + 0x108; \
@@ -47,6 +48,7 @@
 
 /* MVME188 version */
 #ifdef MVME188
+#include <machine/mvme188.h>
 #define	PFSR_SAVE_188 \
 	extu	TMP,  FLAGS, FLAG_CPU_FIELD_WIDTH<0>;	/* TMP = cpu# */ \
 	cmp	TMP2, TMP, 0x0;				/* CPU0 ? */ \
diff --git a/sys/arch/mvme88k/mvme88k/locore_c_routines.c b/sys/arch/mvme88k/mvme88k/locore_c_routines.c
index 91ff8c73d86..3a34927f9a3 100644
--- a/sys/arch/mvme88k/mvme88k/locore_c_routines.c
+++ b/sys/arch/mvme88k/mvme88k/locore_c_routines.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore_c_routines.c,v 1.41 2004/08/01 17:18:05 miod Exp $	*/
+/* $OpenBSD: locore_c_routines.c,v 1.42 2004/08/02 08:35:00 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -29,7 +29,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <machine/board.h>		/* m188 bit defines	*/
 #include <machine/asm.h>		/* END_OF_VECTOR_LIST, etc.	*/
 #include <machine/asm_macro.h>		/* enable/disable interrupts	*/
 #include <machine/cpu_number.h>		/* cpu_number()		*/
@@ -37,6 +36,10 @@
 #include <machine/prom.h>
 #include <machine/trap.h>
 
+#ifdef MVME188
+#include <machine/mvme188.h>
+#endif
+
 typedef struct {
 	unsigned word_one, word_two;
 } m88k_exception_vector_area;
diff --git a/sys/arch/mvme88k/mvme88k/m88110.c b/sys/arch/mvme88k/mvme88k/m88110.c
index ca589803531..543baca087c 100644
--- a/sys/arch/mvme88k/mvme88k/m88110.c
+++ b/sys/arch/mvme88k/mvme88k/m88110.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88110.c,v 1.16 2004/06/26 20:58:13 miod Exp $	*/
+/*	$OpenBSD: m88110.c,v 1.17 2004/08/02 08:35:00 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * All rights reserved.
@@ -62,7 +62,6 @@
 #include <sys/systm.h>
 #include <sys/simplelock.h>
 
-#include <machine/board.h>
 #include <machine/cpu_number.h>
 #include <machine/cmmu.h>
 #include <machine/m88110.h>
diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c
index 12b56cb3a88..cb4ff6a378a 100644
--- a/sys/arch/mvme88k/mvme88k/m8820x.c
+++ b/sys/arch/mvme88k/mvme88k/m8820x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.c,v 1.33 2004/07/31 13:38:32 miod Exp $	*/
+/*	$OpenBSD: m8820x.c,v 1.34 2004/08/02 08:35:00 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -86,12 +86,15 @@
 #include <sys/simplelock.h>
 
 #include <machine/asm_macro.h>
-#include <machine/board.h>
 #include <machine/cpu_number.h>
 #include <machine/locore.h>
 
 #include <machine/cmmu.h>
 #include <machine/m8820x.h>
+#include <machine/mvme188.h>		/* VME_CMMU_ */
+#ifdef MVME187
+#include <machine/mvme187.h>
+#endif
 
 #include <uvm/uvm_extern.h>
 
@@ -235,6 +238,8 @@ struct m8820x_cmmu {
  * Structure for accessing MMUS properly
  */
 
+#define MAX_CMMUS	(2 * MAX_CPUS)		/* maximum cmmus on the board */
+
 struct m8820x_cmmu m8820x_cmmu[MAX_CMMUS] =
 {
 	/* address, cpu, mode, access, alive, addr, mask */
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 365a9c63d5e..6190886ce02 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.152 2004/07/30 20:48:40 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.153 2004/08/02 08:35:00 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -71,7 +71,6 @@
 
 #include <machine/asm_macro.h>   /* enable/disable interrupts */
 #include <machine/mmu.h>
-#include <machine/board.h>
 #include <machine/bug.h>
 #include <machine/bugio.h>
 #include <machine/cmmu.h>		/* CMMU stuff	*/
@@ -83,7 +82,16 @@
 #include <machine/reg.h>
 #include <machine/trap.h>
 #ifdef M88100
-#include <machine/m88100.h>		/* DMT_VALID	*/
+#include <machine/m88100.h>		/* DMT_VALID */
+#endif
+#ifdef MVME187
+#include <machine/mvme187.h>
+#endif
+#ifdef MVME197
+#include <machine/mvme197.h>
+#endif
+#ifdef MVME188
+#include <machine/mvme188.h>
 #endif
 
 #include <dev/cons.h>
@@ -351,6 +359,7 @@ size_memory()
 	/*
 	 * count it up.
 	 */
+#define	MAXPHYSMEM	0x30000000	/* 768MB */
 	max = (void *)MAXPHYSMEM;
 	for (look = (void *)Roundup(end, STRIDE); look < max;
 	    look = (int *)((unsigned)look + STRIDE)) {
diff --git a/sys/arch/mvme88k/mvme88k/mem.c b/sys/arch/mvme88k/mvme88k/mem.c
index 9619264b94b..bfb5e71f9b4 100644
--- a/sys/arch/mvme88k/mvme88k/mem.c
+++ b/sys/arch/mvme88k/mvme88k/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.21 2004/05/08 21:37:30 miod Exp $ */
+/*	$OpenBSD: mem.c,v 1.22 2004/08/02 08:35:00 miod Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -46,7 +46,6 @@
 #include <sys/uio.h>
 #include <sys/malloc.h>
 
-#include <machine/board.h>
 #include <machine/conf.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/mvme88k/mvme88k/pmap_table.c b/sys/arch/mvme88k/mvme88k/pmap_table.c
index c9252b290af..0ba50d31f17 100644
--- a/sys/arch/mvme88k/mvme88k/pmap_table.c
+++ b/sys/arch/mvme88k/mvme88k/pmap_table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_table.c,v 1.19 2004/07/25 11:06:43 miod Exp $	*/
+/*	$OpenBSD: pmap_table.c,v 1.20 2004/08/02 08:35:00 miod Exp $	*/
 
 /*
  * Mach Operating System
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/board.h>
 #include <machine/cmmu.h>
 #include <uvm/uvm_extern.h>
 #include <machine/pmap_table.h>
@@ -41,6 +40,7 @@
 
 /*  phys_start, virt_start, size, prot, cacheability */
 #ifdef MVME187
+#include <machine/mvme187.h>
 const pmap_table_entry
 m187_board_table[] = {
 	{ BUG187_START, BUG187_START, round_page(BUG187_SIZE), RW, CI },
@@ -50,6 +50,7 @@ m187_board_table[] = {
 #endif
 
 #ifdef MVME188
+#include <machine/mvme188.h>
 const pmap_table_entry
 m188_board_table[] = {
 	{ MVME188_UTILITY, MVME188_UTILITY,
@@ -59,6 +60,7 @@ m188_board_table[] = {
 #endif
 
 #ifdef MVME197
+#include <machine/mvme197.h>
 const pmap_table_entry
 m197_board_table[] = {
 	{ FLASH_START, FLASH_START, round_page(FLASH_SIZE), RW, CI },