Module Name: src
Committed By: phx
Date: Sat Mar 19 16:05:36 UTC 2011
Modified Files:
src/sys/arch/sandpoint/conf: GENERIC
Log Message:
Add ral(4) and stge(4) for DLink DSM-G600.
Disabled DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 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.55 src/sys/arch/sandpoint/conf/GENERIC:1.56
--- src/sys/arch/sandpoint/conf/GENERIC:1.55 Sun Mar 6 17:08:30 2011
+++ src/sys/arch/sandpoint/conf/GENERIC Sat Mar 19 16:05:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.55 2011/03/06 17:08:30 bouyer Exp $
+# $NetBSD: GENERIC,v 1.56 2011/03/19 16:05:35 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.55 $"
+#ident "GENERIC-$Revision: 1.56 $"
maxusers 32
@@ -38,7 +38,7 @@
#options MODULAR # module(7) support
#options DEBUG
-options DIAGNOSTIC
+#options DIAGNOSTIC
options TRAP_PANICWAIT
options DDB
#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
@@ -153,23 +153,24 @@
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
#options PCI_NETBSD_CONFIGURE # Have NetBSD configure PCI I/O & Mem
-mainbus0 at root
+mainbus0 at root
-cpu* at mainbus0
-pci* at mainbus0 bus ?
+cpu* at mainbus0
+pci* at mainbus0 bus ?
-pchb* at pci? dev ? function ? # PCI host bridge
+pchb* at pci? dev ? function ? # PCI host bridge
-eumb* at mainbus0
-com0 at eumb? unit 0 # console at 0x4500
-#com1 at eumb? unit 1
-satmgr0 at eumb? unit 1 # satmgr at 0x4600
-ociic* at eumb?
-iic* at ociic?
-rs5c372rtc* at iic? addr 0x32
-#dsrtc* at iic? addr 0x68
+eumb* at mainbus0
+com0 at eumb? unit 0 # console at 0x4500
+#com1 at eumb? unit 1
+satmgr0 at eumb? unit 1 # satmgr at 0x4600
+ociic* at eumb?
+iic* at ociic?
+rs5c372rtc* at iic? addr 0x32
+#dsrtc* at iic? addr 0x68
# PCI IDE controllers - see pciide(4) for supported hardware.
+acardide* at pci? dev ? function ? # Acard IDE controllers
cmdide* at pci? dev ? function ? # CMD tech IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
@@ -181,12 +182,14 @@
wd* at atabus? drive ? flags 0x0000 # the drives themselves
# PCI network interfaces
-tlp* at pci? dev ? function ? # DEC Tulip and similar
+fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
+ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g
re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
skc* at pci? dev ? function ? # Marvell Yukon Gigabit Ethernet
sk* at skc? # Marvell Yukon Gigabit Ethernet
-wm* at pci? dev ? function ? # Intel 8254x gigabit
-fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
+stge* at pci? dev ? function ? # Sundance ST1023 Gigabit
+tlp* at pci? dev ? function ? # DEC Tulip and similar
+wm* at pci? dev ? function ? # Intel 8254x Gigabit Ethernet
inphy* at mii? phy ? # Intel 82555 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
