Module Name: src
Committed By: phx
Date: Sat Jan 7 20:51:23 UTC 2012
Modified Files:
src/sys/arch/sandpoint/conf: GENERIC
Log Message:
Disable flash device unless nor(4) is not finished.
Add pcf8563rtc(4) for NH230/231.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sandpoint/conf/GENERIC
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/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.64 src/sys/arch/sandpoint/conf/GENERIC:1.65
--- src/sys/arch/sandpoint/conf/GENERIC:1.64 Wed Dec 28 20:33:20 2011
+++ src/sys/arch/sandpoint/conf/GENERIC Sat Jan 7 20:51:23 2012
@@ -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 @@ include "arch/sandpoint/conf/std.sandpo
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 @@ mainbus0 at root
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 @@ com0 at eumb? unit 0 # console at 0x4
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
