[src/trunk]: src/sys/arch/sandpoint/conf Disable flash device unless nor(4) i...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4ef8e6a84810
branches:  trunk
changeset: 772551:4ef8e6a84810
user:      phx <phx%NetBSD.org@localhost>
date:      Sat Jan 07 20:51:23 2012 +0000

description:
Disable flash device unless nor(4) is not finished.
Add pcf8563rtc(4) for NH230/231.

diffstat:

 sys/arch/sandpoint/conf/GENERIC |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r d4a8bc19f80c -r 4ef8e6a84810 sys/arch/sandpoint/conf/GENERIC
--- a/sys/arch/sandpoint/conf/GENERIC   Sat Jan 07 20:44:41 2012 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC   Sat Jan 07 20:51:23 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.64 2011/12/28 20:33:20 phx Exp $
+# $NetBSD: GENERIC,v 1.65 2012/01/07 20:51:23 phx Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.64 $"
+#ident                 "GENERIC-$Revision: 1.65 $"
 
 maxusers       32
 
@@ -175,9 +175,9 @@
 
 cpu*           at mainbus0
 
-cfi0           at mainbus0
-nor*           at cfi?
-flash*         at nor?
+#cfi0          at mainbus0
+#nor*          at cfi?
+#flash*                at nor?
 
 pci*           at mainbus0 bus ?
 pchb*          at pci? dev ? function ?        # PCI host bridge
@@ -188,9 +188,10 @@
 satmgr0        at eumb? unit 1                 # satmgr at 0x4600
 ociic*         at eumb?
 iic*           at ociic?
-dsrtc*         at iic? addr 0x68
 rs5c372rtc*    at iic? addr 0x32
 s390rtc*       at iic? addr 0x30
+pcf8563rtc*    at iic? addr 0x51
+dsrtc*         at iic? addr 0x68
 strtc*         at iic? addr 0x68
 options        STRTC_NO_WATCHDOG
 options        STRTC_NO_USERRAM