diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2004-12-30 02:18:17 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2004-12-30 02:18:17 +0000 |
| commit | 9f4c08918e16369411b2d37410dcdd54b4f8e4ec (patch) | |
| tree | e5593911686e8b67eed2e0839cb97a64f3043123 | |
| parent | 8657a333f066d91520b4e5fb4f466133fddf18ca (diff) | |
add ehci and enable atu in GENERIC. get rid of the flags on usb since they
are no longer needed for attachement of devices before root is mounted.
ok deraadt@
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 95bfcfcad22..d038f48bd2a 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.113 2004/12/28 23:04:46 brad Exp $ +# $OpenBSD: GENERIC,v 1.114 2004/12/30 02:18:16 dlg Exp $ # $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $ machine sparc64 @@ -90,10 +90,12 @@ midi* at opl? # PCI USB Controllers ohci* at pci? # Open Host Controller uhci* at pci? # Universal Host Controller (Intel) +ehci* at pci? # Enhanced Host Controller # USB bus support -usb* at ohci? flags 0x1 -usb* at uhci? flags 0x1 +usb* at ohci? +usb* at uhci? +usb* at ehci? # USB devices uhub* at usb? # USB Hubs @@ -126,7 +128,7 @@ ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 uhid* at uhidev? # USB generic HID support aue* at uhub? # ADMtek AN986 Pegasus Ethernet -#atu* at uhub? # Atmel AT76c50x based 802.11b +atu* at uhub? # Atmel AT76c50x based 802.11b axe* at uhub? # ASIX Electronics AX88172 USB Ethernet cue* at uhub? # CATC USB-EL1201A based Ethernet kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index fc8c1fb0892..60d26f59d48 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.36 2004/12/28 23:04:46 brad Exp $ +# $OpenBSD: RAMDISK,v 1.37 2004/12/30 02:18:16 dlg Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -131,8 +131,8 @@ ohci* at pci? # Open Host Controller uhci* at pci? # Universal Host Controller (Intel) # USB bus support -usb* at ohci? flags 0x1 -usb* at uhci? flags 0x1 +usb* at ohci? +usb* at uhci? # USB devices uhub* at usb? # USB Hubs |