diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2018-06-01 17:15:28 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2018-06-01 17:15:28 +0000 |
| commit | 0f4ac2defb2fa511d113180932eb0b006753d41a (patch) | |
| tree | b28cfc2f5e1bc7155e84de01db41684ad83fa3cf /sys/arch/octeon/conf | |
| parent | 1a8d8abad91129aaecf917642a363fbf1da84343 (diff) | |
Add a kludge that fixes the build until com_fdt.c is ready for octeon.
Diffstat (limited to 'sys/arch/octeon/conf')
| -rw-r--r-- | sys/arch/octeon/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/files.octeon | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC index b890757b63a..c7c8f3dd84e 100644 --- a/sys/arch/octeon/conf/GENERIC +++ b/sys/arch/octeon/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.42 2018/05/05 15:51:41 visa Exp $ +# $OpenBSD: GENERIC,v 1.43 2018/06/01 17:15:27 visa Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -49,7 +49,7 @@ ppb* at pci? # PCI-PCI bridges pci* at ppb? cn30xxsmi* at fdt? # MDIO controller -com* at fdt? +com* at fdt_octeon? octcib* at fdt? # Interrupt controller octcit* at fdt? # Interrupt controller v3 octciu* at fdt? # Interrupt controller v1 diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK index 218383c01d6..c3f8b701457 100644 --- a/sys/arch/octeon/conf/RAMDISK +++ b/sys/arch/octeon/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.37 2017/08/01 16:18:11 visa Exp $ +# $OpenBSD: RAMDISK,v 1.38 2018/06/01 17:15:27 visa Exp $ machine octeon mips64 maxusers 4 @@ -49,7 +49,7 @@ ppb* at pci? pci* at ppb? cn30xxsmi* at fdt? # MDIO controller -com* at fdt? +com* at fdt_octeon? octcib* at fdt? # Interrupt controller octcit* at fdt? # Interrupt controller v3 octciu* at fdt? # Interrupt controller v1 diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon index fc22a935f88..af6f4b96bf4 100644 --- a/sys/arch/octeon/conf/files.octeon +++ b/sys/arch/octeon/conf/files.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: files.octeon,v 1.47 2018/05/04 16:12:12 visa Exp $ +# $OpenBSD: files.octeon,v 1.48 2018/06/01 17:15:27 visa Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -76,8 +76,9 @@ file arch/octeon/dev/cn30xxpko.c iobus file arch/octeon/dev/cn30xxasx.c iobus define fdt {[early = 0]} +define fdt_octeon {[early = 0]} -device simplebus: fdt +device simplebus: fdt, fdt_octeon attach simplebus at fdt, iobus file arch/octeon/dev/simplebus.c simplebus @@ -122,7 +123,7 @@ device cnmac: ether, ifnet, mii, ifmedia attach cnmac at cn30xxgmx file arch/octeon/dev/if_cnmac.c cnmac -attach com at fdt with cn30xxuart +attach com at fdt_octeon with cn30xxuart file arch/octeon/dev/cn30xxuart.c cn30xxuart device pcibus |