diff options
| author | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2015-06-28 11:52:58 +0000 |
|---|---|---|
| committer | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2015-06-28 11:52:58 +0000 |
| commit | bcdda6a7e2585385fb9ea066a7c7e8fc2e6fe17c (patch) | |
| tree | 3213aa6e954e77631f07ee307e691b61ae511de3 /sys/arch/octeon/conf | |
| parent | a1e08a308f333afc17c5adda8075a25d65e423b8 (diff) | |
enable octdwctwo and add umass
Diffstat (limited to 'sys/arch/octeon/conf')
| -rw-r--r-- | sys/arch/octeon/conf/GENERIC | 13 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/RAMDISK | 12 |
2 files changed, 16 insertions, 9 deletions
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC index 3037b5f7ccd..23f5c8d1cce 100644 --- a/sys/arch/octeon/conf/GENERIC +++ b/sys/arch/octeon/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.18 2015/02/11 00:15:41 uebayasi Exp $ +# $OpenBSD: GENERIC,v 1.19 2015/06/28 11:52:57 jmatthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -49,9 +49,6 @@ pci* at ppb? cn30xxgmx* at iobus? cnmac* at cn30xxgmx? -#dwctwo0 at iobus? -#usb* at dwctwo? - rgephy* at mii? ukphy* at mii? atphy* at mii? @@ -65,9 +62,15 @@ wd* at pciide? flags 0x0000 # USB Controllers #octhci* at iobus0 +dwctwo0 at iobus? # USB bus support #usb* at octhci? +usb* at dwctwo? # USB devices -#uhub* at usb? # USB Hubs +uhub* at usb? # USB Hubs +umass* at uhub? + +scsibus* at scsi? +sd* at scsibus? diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK index af37d4cc4da..f38633d0988 100644 --- a/sys/arch/octeon/conf/RAMDISK +++ b/sys/arch/octeon/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.16 2015/01/12 23:39:57 tedu Exp $ +# $OpenBSD: RAMDISK,v 1.17 2015/06/28 11:52:57 jmatthew Exp $ machine octeon mips64 maxusers 4 @@ -51,9 +51,13 @@ cnmac* at cn30xxgmx? pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0000 -#octhci* at iobus0 -#usb* at octhci? -#uhub* at usb? +dwctwo0 at iobus0 +usb* at dwctwo? +uhub* at usb? +umass* at uhub? + +scsibus* at scsi? +sd* at scsibus? rgephy* at mii? ukphy* at mii? |