Adjust sizes for the mandatory 1:1 mappings created in pmap_bootstrap().

Saves up to 12KB of no longer necessary page tables.

11 files changed, 79 insertions, 90 deletions

diff --git a/sys/arch/mvme88k/dev/mainbus.c b/sys/arch/mvme88k/dev/mainbus.c
index 2fd42641548..e8f603c1a2e 100644
--- a/sys/arch/mvme88k/dev/mainbus.c
+++ b/sys/arch/mvme88k/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.18 2005/12/11 21:45:31 miod Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.19 2006/04/27 20:19:28 miod Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 2004, Miodrag Vallat.
@@ -40,11 +40,14 @@
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
 
+#ifdef MVME187
+#include <machine/mvme187.h>
+#endif
 #ifdef MVME188
 #include <machine/mvme188.h>
 #endif
-#if defined(MVME187) || defined(MVME197)
-#include <machine/mvme1x7.h>
+#ifdef MVME197
+#include <machine/mvme197.h>
 #endif
 
 void	mainbus_attach(struct device *, struct device *, void *);
@@ -97,11 +100,13 @@ mainbus_map(bus_addr_t addr, bus_size_t size, int flags,
 #ifdef MVME187
 		case BRD_187:
 		case BRD_8120:
+			threshold = OBIO187_START;
+			break;
 #endif
 #ifdef MVME197
 		case BRD_197:
 #endif
-			threshold = OBIO_START;
+			threshold = OBIO197_START;
 			break;
 		}
 	}
diff --git a/sys/arch/mvme88k/dev/pcctwo.c b/sys/arch/mvme88k/dev/pcctwo.c
index f1b82b345e4..1d73c24e061 100644
--- a/sys/arch/mvme88k/dev/pcctwo.c
+++ b/sys/arch/mvme88k/dev/pcctwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcctwo.c,v 1.27 2005/07/18 02:43:25 fgsch Exp $ */
+/*	$OpenBSD: pcctwo.c,v 1.28 2006/04/27 20:19:28 miod Exp $ */
 /*
  * Copyright (c) 1995 Theo de Raadt
  * All rights reserved.
@@ -84,7 +84,7 @@ pcctwomatch(parent, vcf, args)
 		return 0;
 	}
 
-	if (bus_space_map(ca->ca_iot, ca->ca_paddr + PCC2_BASE, PCC2_SIZE,
+	if (bus_space_map(ca->ca_iot, PCC2_BASE, PCC2_SIZE,
 	    0, &ioh) != 0)
 		return 0;
 	rc = badvaddr((vaddr_t)bus_space_vaddr(ca->ca_iot, ioh), 4);
@@ -112,7 +112,7 @@ pcctwoattach(parent, self, args)
 	bus_space_handle_t ioh;
 	u_int8_t genctl;
 
-	sc->sc_base = ca->ca_paddr + PCC2_BASE;
+	sc->sc_base = PCC2_BASE;
 
 	if (bus_space_map(ca->ca_iot, sc->sc_base, PCC2_SIZE, 0, &ioh) != 0) {
 		printf(": can't map registers!\n");
diff --git a/sys/arch/mvme88k/dev/pcctworeg.h b/sys/arch/mvme88k/dev/pcctworeg.h
index 41a95b770fa..a204e462d58 100644
--- a/sys/arch/mvme88k/dev/pcctworeg.h
+++ b/sys/arch/mvme88k/dev/pcctworeg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcctworeg.h,v 1.7 2004/04/24 19:51:48 miod Exp $ */
+/*	$OpenBSD: pcctworeg.h,v 1.8 2006/04/27 20:19:28 miod Exp $ */
 
 /*
  * Memory map for PCC2 chip found in MVME1x7 boards.
@@ -7,7 +7,7 @@
  * two-bytes (16 bits), or four-bytes (32 bits).
  */
 
-#define	PCC2_BASE		0x00042000
+#define	PCC2_BASE		0xfff42000
 #define PCC2_SIZE		0x0040
 
 #define	PCCTWO_CHIPID		0x0000
diff --git a/sys/arch/mvme88k/include/mvme187.h b/sys/arch/mvme88k/include/mvme187.h
index 3be1863a99d..451454197d9 100644
--- a/sys/arch/mvme88k/include/mvme187.h
+++ b/sys/arch/mvme88k/include/mvme187.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme187.h,v 1.6 2004/08/02 08:35:00 miod Exp $ */
+/*	$OpenBSD: mvme187.h,v 1.7 2006/04/27 20:19:31 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -46,18 +46,22 @@
 #ifndef __MACHINE_MVME187_H__
 #define __MACHINE_MVME187_H__
 
-#define BUG187_START	0xFF800000	/* start of BUG PROM */
-#define BUG187_SIZE	0x003FFFFF	/* size of BUG PROM */
-#define SRAM_START	0xFFE00000	/* start of sram used by bug */
-#define SRAM_SIZE	0x0001FFFF	/* size of sram */
+#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 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_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 M187_IACK	0xfffe0000	/* interrupt ACK base */
+
+#define MEM_CTLR	0xfff43000	/* MEMC040 mem controller */
 
 #include <machine/mvme1x7.h>
 
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index 8a7a03ec0a2..73a134147e2 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.25 2006/04/17 18:28:19 miod Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.26 2006/04/27 20:19:31 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -50,10 +50,8 @@
 #define MVME188_EPROM_SIZE	0x00080000
 #define MVME188_SRAM		0xffe00000
 #define MVME188_SRAM_SIZE	0x00020000
-#define MVME188_UTILITY		0xff000000
-#define MVME188_UTILITY_SIZE	0x01000000
-#define UTIL_START		0xffc00000  /* start of MVME188 utility space */
-#define UTIL_SIZE		0x003fffff  /* size of MVME188 utility space */
+#define MVME188_UTILITY		0xfff00000
+#define MVME188_UTILITY_SIZE	0x00090000
 
 /*
  * MVME188 declarations for hardware level device registers and such.
diff --git a/sys/arch/mvme88k/include/mvme197.h b/sys/arch/mvme88k/include/mvme197.h
index fe8f5392d33..e4b4ed5c0b4 100644
--- a/sys/arch/mvme88k/include/mvme197.h
+++ b/sys/arch/mvme88k/include/mvme197.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme197.h,v 1.5 2004/08/02 08:35:00 miod Exp $ */
+/*	$OpenBSD: mvme197.h,v 1.6 2006/04/27 20:19:31 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -46,15 +46,17 @@
 #ifndef __MACHINE_MVME197_H__
 #define __MACHINE_MVME197_H__
 
-#define	FLASH_START	0xFF800000	/* start of flash memory area */
-#define	FLASH_SIZE	0x003FFFFF
-#define BUG197_START	0xFFF80000	/* start of BUG PROM (in OBIO) */
-#define BUG197_SIZE	0x0003FFFF
+#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 */
+#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 */
 
 #include <machine/mvme1x7.h>
 
diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h
index a2eef22b52f..ea8a044103c 100644
--- a/sys/arch/mvme88k/include/mvme1x7.h
+++ b/sys/arch/mvme88k/include/mvme1x7.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme1x7.h,v 1.12 2006/04/19 22:09:40 miod Exp $ */
+/*	$OpenBSD: mvme1x7.h,v 1.13 2006/04/27 20:19:31 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -46,15 +46,11 @@
 #ifndef __MACHINE_MVME1X7_H__
 #define __MACHINE_MVME1X7_H__
 
-#define OBIO_START	0xFFF00000	/* start of local IO */
-#define OBIO_SIZE	0x000EFFFF	/* size of obio space */
-
 #define INT_PRI_LEVEL	0xFFF4203E	/* interrupt priority level */
 #define INT_MASK_LEVEL	0xFFF4203F	/* interrupt mask level */
 
 #define LOCAL_IO_DEVS	0xFFF00000	/* local IO devices */
 
-#define MEM_CTLR	0xFFF43000	/* MEMC040 mem controller */
 #define SCC_ADDR	0xFFF45000 	/* Cirrus Chip */
 #define LANCE_ADDR	0xFFF46000 	/* 82596CA */
 #define SCSI_ADDR	0xFFF47000 	/* NCR 710 address */
diff --git a/sys/arch/mvme88k/mvme88k/m187_machdep.c b/sys/arch/mvme88k/mvme88k/m187_machdep.c
index 379c0baef20..012f4a94fba 100644
--- a/sys/arch/mvme88k/mvme88k/m187_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m187_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m187_machdep.c,v 1.9 2006/04/19 22:09:40 miod Exp $	*/
+/*	$OpenBSD: m187_machdep.c,v 1.10 2006/04/27 20:19:31 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -72,7 +72,6 @@ void	m187_startup(void);
 
 vaddr_t obiova;
 vaddr_t bugromva;
-vaddr_t sramva;
 
 /*
  * Figure out how much memory is available, by querying the memory controllers.
@@ -97,17 +96,6 @@ void
 m187_startup()
 {
 	/*
-	 * Grab the SRAM space that we hardwired in pmap_bootstrap
-	 */
-	sramva = SRAM_START;
-	uvm_map(kernel_map, (vaddr_t *)&sramva, SRAM_SIZE,
-	    NULL, UVM_UNKNOWN_OFFSET, 0,
-	      UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
-	        UVM_ADV_NORMAL, 0));
-	if (sramva != SRAM_START)
-		panic("sramva %lx: SRAM not free", sramva);
-
-	/*
 	 * Grab the BUGROM space that we hardwired in pmap_bootstrap
 	 */
 	bugromva = BUG187_START;
@@ -121,12 +109,12 @@ m187_startup()
 	/*
 	 * Grab the OBIO space that we hardwired in pmap_bootstrap
 	 */
-	obiova = OBIO_START;
-	uvm_map(kernel_map, (vaddr_t *)&obiova, OBIO_SIZE,
+	obiova = OBIO187_START;
+	uvm_map(kernel_map, (vaddr_t *)&obiova, OBIO187_SIZE,
 	    NULL, UVM_UNKNOWN_OFFSET, 0,
 	      UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
 	        UVM_ADV_NORMAL, 0));
-	if (obiova != OBIO_START)
+	if (obiova != OBIO187_START)
 		panic("obiova %lx: OBIO not free", obiova);
 }
 
diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c
index 255f9b4fc2d..2c9a7ee7f53 100644
--- a/sys/arch/mvme88k/mvme88k/m197_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m197_machdep.c,v 1.9 2006/04/19 22:09:40 miod Exp $	*/
+/*	$OpenBSD: m197_machdep.c,v 1.10 2006/04/27 20:19:31 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -137,12 +137,12 @@ m197_startup()
 	/*
 	 * Grab the OBIO space that we hardwired in pmap_bootstrap
 	 */
-	obiova = OBIO_START;
-	uvm_map(kernel_map, (vaddr_t *)&obiova, OBIO_SIZE,
+	obiova = OBIO197_START;
+	uvm_map(kernel_map, (vaddr_t *)&obiova, OBIO197_SIZE,
 	    NULL, UVM_UNKNOWN_OFFSET, 0,
 	      UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
 	        UVM_ADV_NORMAL, 0));
-	if (obiova != OBIO_START)
+	if (obiova != OBIO197_START)
 		panic("obiova %lx: OBIO not free", obiova);
 }
 
diff --git a/sys/arch/mvme88k/mvme88k/m1x7_machdep.c b/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
index f497f6fdcf1..e74b5ddad50 100644
--- a/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m1x7_machdep.c,v 1.1 2006/04/19 22:09:40 miod Exp $ */
+/*	$OpenBSD: m1x7_machdep.c,v 1.2 2006/04/27 20:19:31 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1995 Theo de Raadt
@@ -103,14 +103,13 @@ m1x7_init_clocks(void)
 	tick = 1000000 / hz;
 
 	/* profclock */
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CTL) = 0;
-	*(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CMP) =
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T1CTL) = 0;
+	*(volatile u_int32_t *)(PCC2_BASE + PCCTWO_T1CMP) =
 	    pcc2_timer_us2lim(tick);
-	*(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1COUNT) = 0;
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1CTL) =
+	*(volatile u_int32_t *)(PCC2_BASE + PCCTWO_T1COUNT) = 0;
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T1CTL) =
 	    PCC2_TCTL_CEN | PCC2_TCTL_COC | PCC2_TCTL_COVF;
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) =
-	    PROF_RESET;
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T1ICR) = PROF_RESET;
 
 	if (stathz == 0)
 		stathz = hz;
@@ -128,14 +127,13 @@ m1x7_init_clocks(void)
 		statvar >>= 1;
 
 	/* statclock */
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = 0;
-	*(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CMP) =
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T2CTL) = 0;
+	*(volatile u_int32_t *)(PCC2_BASE + PCCTWO_T2CMP) =
 	    pcc2_timer_us2lim(statint);
-	*(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2COUNT) = 0;
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) =
+	*(volatile u_int32_t *)(PCC2_BASE + PCCTWO_T2COUNT) = 0;
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T2CTL) =
 	    PCC2_TCTL_CEN | PCC2_TCTL_COC | PCC2_TCTL_COVF;
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) =
-	    STAT_RESET;
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T2ICR) = STAT_RESET;
 
 	statmin = statint - (statvar >> 1);
 
@@ -163,8 +161,7 @@ m1x7_init_clocks(void)
 int
 m1x7_clockintr(void *eframe)
 {
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) =
-	    PROF_RESET;
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T1ICR) = PROF_RESET;
 
 	hardclock(eframe);
 #if NBUGTTY > 0
@@ -179,8 +176,7 @@ m1x7_statintr(void *eframe)
 {
 	u_long newint, r, var;
 
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) =
-	    STAT_RESET;
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T2ICR) = STAT_RESET;
 
 	statclock((struct clockframe *)eframe);
 
@@ -195,13 +191,12 @@ m1x7_statintr(void *eframe)
 	} while (r == 0);
 	newint = statmin + r;
 
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) = 0;
-	*(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CMP) =
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T2CTL) = 0;
+	*(volatile u_int32_t *)(PCC2_BASE + PCCTWO_T2CMP) =
 	    pcc2_timer_us2lim(newint);
-	*(volatile u_int32_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2COUNT) = 0;
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) =
-	    STAT_RESET;
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2CTL) =
+	*(volatile u_int32_t *)(PCC2_BASE + PCCTWO_T2COUNT) = 0;
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T2ICR) = STAT_RESET;
+	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T2CTL) =
 	    PCC2_TCTL_CEN | PCC2_TCTL_COC;
 	return (1);
 }
diff --git a/sys/arch/mvme88k/mvme88k/pmap_table.c b/sys/arch/mvme88k/mvme88k/pmap_table.c
index a3ae7df9ff0..03caffdcfeb 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.21 2005/04/27 14:07:38 miod Exp $	*/
+/*	$OpenBSD: pmap_table.c,v 1.22 2006/04/27 20:19:31 miod Exp $	*/
 
 /*
  * Mach Operating System
@@ -34,8 +34,8 @@
 #include <machine/cmmu.h>
 #include <machine/pmap_table.h>
 
-#define	R	VM_PROT_READ
-#define	RW	(VM_PROT_READ | VM_PROT_WRITE)
+#define	R	UVM_PROT_R
+#define	RW	UVM_PROT_RW
 #define	CW	CACHE_WT
 #define	CI	CACHE_INH
 #define	CG	CACHE_GLOBAL
@@ -45,8 +45,8 @@
 #include <machine/mvme187.h>
 const pmap_table_entry
 m187_board_table[] = {
-	{ BUG187_START, BUG187_START, round_page(BUG187_SIZE), RW, CI },
-	{ OBIO_START  , OBIO_START  , round_page(OBIO_SIZE)  , RW, CI },
+	{ BUG187_START,		BUG187_START,	BUG187_SIZE,	RW, CI },
+	{ OBIO187_START,	OBIO187_START,	OBIO187_SIZE,	RW, CI },
 	{ 0, 0, 0xffffffff, 0, 0 },
 };
 #endif
@@ -55,8 +55,8 @@ m187_board_table[] = {
 #include <machine/mvme188.h>
 const pmap_table_entry
 m188_board_table[] = {
-	{ MVME188_UTILITY, MVME188_UTILITY,
-	    round_page(MVME188_UTILITY_SIZE), RW, CI },
+	{ MVME188_EPROM,	MVME188_EPROM,	MVME188_EPROM_SIZE, RW, CI },
+	{ MVME188_UTILITY,	MVME188_UTILITY, MVME188_UTILITY_SIZE, RW, CI },
 	{ 0, 0, 0xffffffff, 0, 0 },
 };
 #endif
@@ -65,8 +65,9 @@ m188_board_table[] = {
 #include <machine/mvme197.h>
 const pmap_table_entry
 m197_board_table[] = {
-	{ FLASH_START, FLASH_START, round_page(FLASH_SIZE), RW, CI },
-	{ OBIO_START , OBIO_START , round_page(OBIO_SIZE) , RW, CI },
+	/* We need flash 1:1 mapped to access the 88410 chip underneath */
+	{ FLASH_START,		FLASH_START,	FLASH_SIZE,	RW, CI },
+	{ OBIO197_START,	OBIO197_START,	OBIO197_SIZE,	RW, CI },
 	/* No need to mention BUG here - it is contained inside OBIO */
 	{ 0, 0, 0xffffffff, 0, 0 },
 };