Module Name: src
Committed By: phx
Date: Wed Apr 6 18:12:15 UTC 2011
Modified Files:
src/sys/arch/sandpoint/conf: GENERIC
Log Message:
Enable all known RTC drivers. The correct RTC will automatically be chosen as
an I2C device, depending on the NAS model.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 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.57 src/sys/arch/sandpoint/conf/GENERIC:1.58
--- src/sys/arch/sandpoint/conf/GENERIC:1.57 Sun Mar 20 17:10:46 2011
+++ src/sys/arch/sandpoint/conf/GENERIC Wed Apr 6 18:12:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.57 2011/03/20 17:10:46 phx Exp $
+# $NetBSD: GENERIC,v 1.58 2011/04/06 18:12:15 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.57 $"
+#ident "GENERIC-$Revision: 1.58 $"
maxusers 32
@@ -185,8 +185,12 @@
satmgr0 at eumb? unit 1 # satmgr at 0x4600
ociic* at eumb?
iic* at ociic?
+dsrtc* at iic? addr 0x68
rs5c372rtc* at iic? addr 0x32
-#dsrtc* at iic? addr 0x68
+s390rtc* at iic? addr 0x30
+#strtc* at iic? addr 0x68
+#options STRTC_NO_WATCHDOG
+#options STRTC_NO_USERRAM
# PCI IDE controllers - see pciide(4) for supported hardware.
acardide* at pci? dev ? function ? # Acard IDE controllers
