diff options
| author | Takuya ASADA <syuu@cvs.openbsd.org> | 2011-05-08 13:39:31 +0000 |
|---|---|---|
| committer | Takuya ASADA <syuu@cvs.openbsd.org> | 2011-05-08 13:39:31 +0000 |
| commit | db2db4b6665ab8b66e5d34e8ee1f7b1a0c3a9007 (patch) | |
| tree | b49cfc76f504691cf9aaa11454c6e7d88fe3a7ce /sys/arch/octeon/conf | |
| parent | b26609bbae04ffd505ecd0ec89bf2998e8dd00dd (diff) | |
combus renamed uartbus, com_oct renamed cn30xxuart
Diffstat (limited to 'sys/arch/octeon/conf')
| -rw-r--r-- | sys/arch/octeon/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/RAMDISK | 8 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/files.octeon | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC index 5685efe1c74..60d028bcd39 100644 --- a/sys/arch/octeon/conf/GENERIC +++ b/sys/arch/octeon/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.6 2011/05/08 13:24:55 syuu Exp $ +# $OpenBSD: GENERIC,v 1.7 2011/05/08 13:39:30 syuu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -29,12 +29,12 @@ mainbus0 at root cpu0 at mainbus0 clock0 at mainbus0 iobus0 at mainbus0 -combus0 at mainbus0 +uartbus0 at mainbus0 octcf0 at iobus0 -com0 at combus0 -com1 at combus0 +com0 at uartbus0 +com1 at uartbus0 pcibus* at iobus0 pci* at pcibus? diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK index e391dc0b2a2..f61b487ae35 100644 --- a/sys/arch/octeon/conf/RAMDISK +++ b/sys/arch/octeon/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.7 2011/05/08 13:24:55 syuu Exp $ +# $OpenBSD: RAMDISK,v 1.8 2011/05/08 13:39:30 syuu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -43,12 +43,12 @@ mainbus0 at root cpu0 at mainbus0 clock0 at mainbus0 iobus0 at mainbus0 -combus0 at mainbus0 +uartbus0 at mainbus0 octcf0 at iobus0 -com0 at combus0 -com1 at combus0 +com0 at uartbus0 +com1 at uartbus0 pcibus* at iobus0 pci* at pcibus? diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon index df5bce0c444..87a4c500864 100644 --- a/sys/arch/octeon/conf/files.octeon +++ b/sys/arch/octeon/conf/files.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: files.octeon,v 1.7 2011/05/08 13:24:55 syuu Exp $ +# $OpenBSD: files.octeon,v 1.8 2011/05/08 13:39:30 syuu Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -60,13 +60,13 @@ device octcf: disk attach octcf at iobus file arch/octeon/dev/octcf.c octcf -define combus {[base = -1]} -device combus -attach combus at mainbus -file arch/octeon/dev/combus.c combus +define uartbus {[base = -1]} +device uartbus +attach uartbus at mainbus +file arch/octeon/dev/octeon_uartbus.c uartbus -attach com at combus with com_oct -file arch/octeon/dev/com_oct.c com_oct +attach com at uartbus with cn30xxuart +file arch/octeon/dev/cn30xxuart.c cn30xxuart device pcibus attach pcibus at iobus |