summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2004-12-30 02:18:16 +0000
committerdlg <dlg@openbsd.org>2004-12-30 02:18:16 +0000
commited6364268756bb5cf29db35c9d26740c8a780ee4 (patch)
tree7709cb56e1f695ec1615160b4be3339e146c86d1
parentstdinit() and flush_all() are prototyped globally, no need to do it (diff)
downloadwireguard-openbsd-ed6364268756bb5cf29db35c9d26740c8a780ee4.tar.xz
wireguard-openbsd-ed6364268756bb5cf29db35c9d26740c8a780ee4.zip
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/GENERIC10
-rw-r--r--sys/arch/sparc64/conf/RAMDISK6
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