Module Name: src
Committed By: uebayasi
Date: Thu Aug 19 01:02:22 UTC 2010
Modified Files:
src/sys/arch/evbppc/obs405 [uebayasi-xip]: obs266_autoconf.c
src/sys/arch/powerpc/conf [uebayasi-xip]: files.ibm4xx
src/sys/arch/powerpc/ibm4xx/dev [uebayasi-xip]: exb.c
Log Message:
Define FlashROM addresses in board specific code.
To generate a diff of this commit:
cvs rdiff -u -r1.4.76.1 -r1.4.76.2 \
src/sys/arch/evbppc/obs405/obs266_autoconf.c
cvs rdiff -u -r1.10.88.3 -r1.10.88.4 src/sys/arch/powerpc/conf/files.ibm4xx
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/powerpc/ibm4xx/dev/exb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/obs405/obs266_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.4.76.1 src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.4.76.2
--- src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.4.76.1 Fri Apr 30 14:39:18 2010
+++ src/sys/arch/evbppc/obs405/obs266_autoconf.c Thu Aug 19 01:02:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_autoconf.c,v 1.4.76.1 2010/04/30 14:39:18 uebayasi Exp $ */
+/* $NetBSD: obs266_autoconf.c,v 1.4.76.2 2010/08/19 01:02:21 uebayasi Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,15 +33,19 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.4.76.1 2010/04/30 14:39:18 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.4.76.2 2010/08/19 01:02:21 uebayasi Exp $");
+
+#include "flash_exb.h"
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/obs266.h>
#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dcr4xx.h>
+#include <powerpc/ibm4xx/dev/exbvar.h>
#include <dev/ic/comreg.h>
@@ -78,3 +82,17 @@
obs405_device_register(dev, aux, OBS266_COM_FREQ);
}
+
+#if NFLASH_EXB > 0
+const struct exb_conf exb_confs[] = {
+ /* 0xff800000-0xff810000 */
+ { "flash", 0xff800000 + 0x00000000, 0x00010000 },
+ /* 0xff810000-0xfffc0000 */
+ { "flash", 0xff800000 + 0x00010000, 0x007b0000 },
+#if 0 /* XXX extent(9) */
+ /* 0xfffc0000-0xffffffff */
+ { "flash", 0xff800000 + 0x007c0000, 0x00040000 },
+#endif
+ { NULL }
+};
+#endif
Index: src/sys/arch/powerpc/conf/files.ibm4xx
diff -u src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.3 src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.4
--- src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.3 Wed Aug 11 13:56:28 2010
+++ src/sys/arch/powerpc/conf/files.ibm4xx Thu Aug 19 01:02:21 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.ibm4xx,v 1.10.88.3 2010/08/11 13:56:28 uebayasi Exp $
+# $NetBSD: files.ibm4xx,v 1.10.88.4 2010/08/19 01:02:21 uebayasi Exp $
#
# IBM 4xx specific configuration info
@@ -77,4 +77,4 @@
# FlashROM on external bus
attach flash at exb with flash_exb
-file arch/powerpc/ibm4xx/dev/flash_exb.c flash_exb
+file arch/powerpc/ibm4xx/dev/flash_exb.c flash_exb needs-flag
Index: src/sys/arch/powerpc/ibm4xx/dev/exb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/exb.c:1.1.2.1 src/sys/arch/powerpc/ibm4xx/dev/exb.c:1.1.2.2
--- src/sys/arch/powerpc/ibm4xx/dev/exb.c:1.1.2.1 Wed Aug 11 13:53:22 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/exb.c Thu Aug 19 01:02:21 2010
@@ -1,4 +1,4 @@
-/* $Id: exb.c,v 1.1.2.1 2010/08/11 13:53:22 uebayasi Exp $ */
+/* $Id: exb.c,v 1.1.2.2 2010/08/19 01:02:21 uebayasi Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exb.c,v 1.1.2.1 2010/08/11 13:53:22 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exb.c,v 1.1.2.2 2010/08/19 01:02:21 uebayasi Exp $");
#include "locators.h"
@@ -43,19 +43,11 @@
#include <powerpc/ibm4xx/dcr4xx.h>
#include <powerpc/ibm4xx/dev/exbvar.h>
-/* XXX board specific */
-static const struct exb_conf exb_confs[] = {
- { "flash", 0xff800000 + 0x00000000, 0x00010000 }, // 0xff800000
- { "flash", 0xff800000 + 0x00010000, 0x007b0000 }, // 0xff810000
-#if 0 /* XXX extent(9) */
- { "flash", 0xff800000 + 0x007c0000, 0x00040000 }, // 0xfffc0000
-#endif
- { NULL }
-};
-
struct exb_softc {
};
+extern const struct exb_conf exb_confs[];
+
static int exb_match(device_t, struct cfdata *, void *);
static void exb_attach(device_t, struct device *, void *);
static int exb_print(void *, const char *);
