Module Name: src
Committed By: matt
Date: Wed Jul 25 03:09:02 UTC 2012
Modified Files:
src/sys/arch/evbppc/conf: P2020RDB
Log Message:
Move dsrtc to correct bus.
Add drvctl
Add sdhc at pci
Remove pq3pci (P2020 only has PCIe).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/conf/P2020RDB
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/evbppc/conf/P2020RDB
diff -u src/sys/arch/evbppc/conf/P2020RDB:1.14 src/sys/arch/evbppc/conf/P2020RDB:1.15
--- src/sys/arch/evbppc/conf/P2020RDB:1.14 Mon Jul 23 16:27:44 2012
+++ src/sys/arch/evbppc/conf/P2020RDB Wed Jul 25 03:09:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: P2020RDB,v 1.14 2012/07/23 16:27:44 matt Exp $
+# $NetBSD: P2020RDB,v 1.15 2012/07/25 03:09:01 matt Exp $
#
# P2020RBD -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "P2020RBD-$Revision: 1.14 $"
+ident "P2020RBD-$Revision: 1.15 $"
maxusers 32
@@ -180,12 +180,10 @@ ukphy* at mii?
diic* at cpunode? # i2c bus
iic* at diic?
-dsrtc* at iic1 addr 0x68 flags 1339 # RTC DS1339
+dsrtc* at iic0 addr 0x68 flags 1339 # RTC DS1339
pq3pcie* at cpunode? # PCI-Express controller
-pq3pci* at cpunode? # PCI(X)
pci* at pq3pcie?
-pci* at pq3pci?
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb?
@@ -194,6 +192,12 @@ ahcisata* at pci? dev ? function ?
atabus* at ahcisata? channel ?
wd* at atabus? drive ?
+sdhc* at pci? dev ? function ?
+
+sdhc* at cpunode? # sdmmc
+sdmmc* at sdhc? # SD/MMC bus
+ld* at sdmmc?
+
ehci* at cpunode? # usb
usb* at ehci?
uhub* at usb?
@@ -201,10 +205,6 @@ umass* at uhub? port ?
scsibus* at umass? channel ?
sd* at scsibus? target ? lun ?
-sdhc* at cpunode? # sdmmc
-sdmmc* at sdhc? # SD/MMC bus
-ld* at sdmmc?
-
#siisata* at pci? dev ? function ?
#atabus* at siisata? channel ?
#jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
@@ -225,6 +225,7 @@ ld* at sdmmc?
pseudo-device loop # network loopback
pseudo-device bpfilter # packet filter
pseudo-device clockctl # user control of clock subsystem
+pseudo-device drvctl # user control of disk subsystem
pseudo-device ksyms # /dev/ksyms
pseudo-device pty # pseudo-terminals
pseudo-device kttcp # kernel ttcp
