diff options
| author | Takuya ASADA <syuu@cvs.openbsd.org> | 2010-10-28 22:50:50 +0000 |
|---|---|---|
| committer | Takuya ASADA <syuu@cvs.openbsd.org> | 2010-10-28 22:50:50 +0000 |
| commit | 686b74e04c56cd1edd86b0f6786787c0d6d2f376 (patch) | |
| tree | 83beba815d93b51461bf9871349f7259e0565a67 /sys/arch/octeon/conf | |
| parent | 6987f819f0504a38818ea30c7b3de582dbd72107 (diff) | |
Inital commit of PCI and SATA support for OCTEON
Diffstat (limited to 'sys/arch/octeon/conf')
| -rw-r--r-- | sys/arch/octeon/conf/GENERIC | 11 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/RAMDISK | 11 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/files.octeon | 9 |
3 files changed, 28 insertions, 3 deletions
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC index 697f4c994c2..55625d4df42 100644 --- a/sys/arch/octeon/conf/GENERIC +++ b/sys/arch/octeon/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.3 2010/10/26 00:02:01 syuu Exp $ +# $OpenBSD: GENERIC,v 1.4 2010/10/28 22:50:49 syuu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -34,3 +34,12 @@ octcf0 at obio0 com0 at combus0 com1 at combus0 + +pcibus* at obio0 +pci* at pcibus? + +# IDE Controller +pciide* at pci? flags 0x0000 + +# IDE hard drives +wd* at pciide? flags 0x0000 diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK index bef2d43a528..20531047761 100644 --- a/sys/arch/octeon/conf/RAMDISK +++ b/sys/arch/octeon/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.4 2010/10/26 00:02:01 syuu Exp $ +# $OpenBSD: RAMDISK,v 1.5 2010/10/28 22:50:49 syuu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -49,6 +49,15 @@ octcf0 at obio0 com0 at combus0 com1 at combus0 +pcibus* at obio0 +pci* at pcibus? + +# IDE Controller +pciide* at pci? flags 0x0000 + +# IDE hard drives +wd* at pciide? flags 0x0000 + pseudo-device loop 1 # network loopback pseudo-device bpfilter 1 # packet filter pseudo-device rd 1 # ram disk diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon index 5efc43a6dc9..6e71787bad1 100644 --- a/sys/arch/octeon/conf/files.octeon +++ b/sys/arch/octeon/conf/files.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: files.octeon,v 1.5 2010/10/26 00:02:01 syuu Exp $ +# $OpenBSD: files.octeon,v 1.6 2010/10/28 22:50:49 syuu Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -66,3 +66,10 @@ file arch/octeon/dev/combus.c combus attach com at combus with com_oct file arch/octeon/dev/com_oct.c com_oct + +device pcibus +attach pcibus at obio +file arch/octeon/dev/octeon_pcibus.c pcibus +file arch/octeon/dev/octeon_bus_space.c + +file arch/octeon/octeon/pciide_machdep.c pciide |