diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2017-07-03 08:17:21 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2017-07-03 08:17:21 +0000 |
| commit | 6e003c4791f24f0e4b5fccb13c9bea07c9babb72 (patch) | |
| tree | e309fd358e2b686d75b0d1c7410414e13f06e71e /sys/arch/octeon/conf | |
| parent | 22d70a15bff46b788f7d0b17675654aeed1cbcea (diff) | |
Attach com(4) using fdt on octeon.
The relevant part of uartbus(4) is made part of the com(4) glue
to avoid extra maneuvers in the code.
Diffstat (limited to 'sys/arch/octeon/conf')
| -rw-r--r-- | sys/arch/octeon/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/RAMDISK | 6 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/files.octeon | 9 |
3 files changed, 6 insertions, 16 deletions
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC index 10890efb652..cec46389cb2 100644 --- a/sys/arch/octeon/conf/GENERIC +++ b/sys/arch/octeon/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.33 2017/06/18 13:58:44 visa Exp $ +# $OpenBSD: GENERIC,v 1.34 2017/07/03 08:17:20 visa Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -31,7 +31,6 @@ mainbus0 at root cpu0 at mainbus0 clock0 at mainbus0 iobus0 at mainbus0 -uartbus0 at mainbus0 simplebus* at fdt? simplebus* at iobus? @@ -42,9 +41,6 @@ octcf0 at iobus0 amdcf0 at iobus0 octrng0 at iobus0 -com0 at uartbus0 -com1 at uartbus0 - pcibus* at iobus0 pci* at pcibus? @@ -52,6 +48,7 @@ ppb* at pci? # PCI-PCI bridges pci* at ppb? cn30xxsmi* at fdt? # MDIO controller +com* at fdt? octciu* at fdt? # Interrupt controller v1 octmmc* at fdt? # MMC host controller sdmmc* at octmmc? # SD/MMC bus diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK index 3b10b89bc6a..0e9d6413a91 100644 --- a/sys/arch/octeon/conf/RAMDISK +++ b/sys/arch/octeon/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.31 2017/06/18 13:58:44 visa Exp $ +# $OpenBSD: RAMDISK,v 1.32 2017/07/03 08:17:20 visa Exp $ machine octeon mips64 maxusers 4 @@ -37,9 +37,6 @@ clock0 at mainbus0 iobus0 at mainbus0 octcf0 at iobus0 amdcf0 at iobus0 -uartbus0 at mainbus0 -com0 at uartbus0 -com1 at uartbus0 simplebus* at fdt? simplebus* at iobus? @@ -52,6 +49,7 @@ ppb* at pci? pci* at ppb? cn30xxsmi* at fdt? # MDIO controller +com* at fdt? octciu* at fdt? # Interrupt controller v1 octmmc* at fdt? # MMC host controller sdmmc* at octmmc? # SD/MMC bus diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon index b49f6150445..d8d521902db 100644 --- a/sys/arch/octeon/conf/files.octeon +++ b/sys/arch/octeon/conf/files.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: files.octeon,v 1.37 2017/06/18 13:58:44 visa Exp $ +# $OpenBSD: files.octeon,v 1.38 2017/07/03 08:17:20 visa Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -115,12 +115,7 @@ device cnmac: ether, ifnet, mii, ifmedia attach cnmac at cn30xxgmx file arch/octeon/dev/if_cnmac.c cnmac -define uartbus {[base = -1]} -device uartbus -attach uartbus at mainbus -file arch/octeon/dev/octeon_uartbus.c uartbus - -attach com at uartbus with cn30xxuart +attach com at fdt with cn30xxuart file arch/octeon/dev/cn30xxuart.c cn30xxuart device pcibus |