summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authortnn <tnn@NetBSD.org>2007-08-18 11:35:55 +0000
committertnn <tnn@NetBSD.org>2007-08-18 11:35:55 +0000
commitb53aba8a3251fed541bae286d93f5ed40cfa78ea (patch)
treea94bc4a0648c1693d52e964e02f71605648bc6e0 /sys
parenta8bb660a9aede2f6958078edf1a88d331dd6c512 (diff)
Enable spdmem(4) in ALL configuration. Add commented out entries to GENERIC
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC10
-rw-r--r--sys/arch/i386/conf/ALL6
-rw-r--r--sys/arch/i386/conf/GENERIC9
3 files changed, 19 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index c6d7f8f1683..e3b2a93c0eb 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.154 2007/08/06 21:26:53 adrianp Exp $
+# $NetBSD: GENERIC,v 1.155 2007/08/18 11:35:55 tnn Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.154 $"
+#ident "GENERIC-$Revision: 1.155 $"
maxusers 32 # estimated number of users
@@ -402,6 +402,12 @@ iic* at nfsmb?
# Abit uGuru Hardware system monitor
#ug0 at isa? port 0xe0
+# Serial Presence Detect capable memory modules
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+
# I2O devices
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index d93c72ec4a0..3b85c848bb2 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.115 2007/07/28 11:06:23 kiyohara Exp $
+# $NetBSD: ALL,v 1.116 2007/08/18 11:35:55 tnn Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.115 $"
+#ident "ALL-$Revision: 1.116 $"
maxusers 32 # estimated number of users
@@ -652,6 +652,8 @@ ug0 at isa? port 0xe0
# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
viaenv* at pci? dev ? function ?
+# Serial Presence Detect capable memory modules
+spdmem* at iic? addr 0x50
# I2O devices
iop* at pci? dev ? function ? # I/O processor
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 40458dee316..7a0a7b25d63 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.840 2007/08/06 21:26:55 adrianp Exp $
+# $NetBSD: GENERIC,v 1.841 2007/08/18 11:35:55 tnn Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.840 $"
+#ident "GENERIC-$Revision: 1.841 $"
maxusers 32 # estimated number of users
@@ -646,6 +646,11 @@ iic* at piixpm? # SMBus on PIIX4
# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
#viaenv* at pci? dev ? function ?
+# Serial Presence Detect capable memory modules
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
# I2O devices
iop* at pci? dev ? function ? # I/O processor