summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbmercer <bmercer@openbsd.org>2013-06-14 23:46:31 +0000
committerbmercer <bmercer@openbsd.org>2013-06-14 23:46:31 +0000
commit76b120717b2c1bca821a00a520c872009901de27 (patch)
tree0ad235d404c27bd15641c9632d6e133999cc4ce7
parentAdd OpenBSD RCS Tag. (diff)
downloadwireguard-openbsd-76b120717b2c1bca821a00a520c872009901de27.tar.xz
wireguard-openbsd-76b120717b2c1bca821a00a520c872009901de27.zip
Updating the ramdisk to support usb.
OK patrick@
-rw-r--r--sys/arch/beagle/conf/RAMDISK44
1 files changed, 24 insertions, 20 deletions
diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK
index d2e827b7459..0a8dd1f3360 100644
--- a/sys/arch/beagle/conf/RAMDISK
+++ b/sys/arch/beagle/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.21 2013/05/31 19:24:16 rapha Exp $
+# $OpenBSD: RAMDISK,v 1.22 2013/06/14 23:46:31 bmercer Exp $
#
# GENERIC machine description file
#
@@ -28,6 +28,8 @@ options MSDOSFS # MS-DOS file system
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6 (needs INET)
options DDB # kernel debugger
+options DIAGNOSTIC
+option DDB_SAFE_CONSOLE
options FIFO # FIFOs; RECOMMENDED
#options NFSCLIENT # NFS
@@ -78,11 +80,12 @@ gptimer* at soc? # general purpose timers
dmtimer* at soc? # am335x dual mode timers
ommmc* at soc? # SD/MMC card controller
omusbtll* at soc?
+cpsw* at soc?
#omkbd0 at soc?
#wskbd* at omkbd? mux 1
-ehci0 at soc? # EHCI (shim)
+ehci* at soc? # EHCI (shim)
usb* at ehci?
#mcspi0 at soc? addr 0x48098000 intr 65
@@ -94,12 +97,12 @@ usb* at ehci?
#usbotg0 at soc?
#usb* at ohci?
-# ## USB bus support
-# usb* at ohci? flags 0x1
-# uhub* at usb?
-# uhub* at uhub?
-#
-# uhub* at usb? # USB Hubs
+## USB bus support
+usb* at ehci? flags 0x1
+uhub* at usb?
+uhub* at uhub?
+
+uhub* at usb? # USB Hubs
# uhub* at uhub? # USB Hubs
# umodem* at uhub? # USB Modems/Serial
# ucom* at umodem?
@@ -120,20 +123,20 @@ usb* at ehci?
# umidi* at uhub? # USB MIDI
# midi* at umidi?
# ulpt* at uhub? # USB Printers
-# umass* at uhub? # USB Mass Storage devices
-# scsibus* at umass?
-# uhidev* at uhub? # Human Interface Devices
-# ums* at uhidev? # USB mouse
-# wsmouse* at ums? mux 0
-# ukbd* at uhidev? # USB keyboard
-# wskbd* at ukbd? mux 1
-# uhid* at uhidev? # USB generic HID support
+umass* at uhub? # USB Mass Storage devices
+scsibus* at umass?
+uhidev* at uhub? # Human Interface Devices
+ums* at uhidev? # USB mouse
+wsmouse* at ums? mux 0
+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
# axe* at uhub? # ASIX Electronics AX88172 USB Ethernet
# cue* at uhub? # CATC USB-EL1201A based Ethernet
# kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet
-# smsc* at uhub? # SMSC LAN95xx Ethernet
+smsc* at uhub? # SMSC LAN95xx Ethernet
# cdce* at uhub? # CDC Ethernet
# upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
# udav* at uhub? # Davicom DM9601 based Ethernet
@@ -145,10 +148,10 @@ usb* at ehci?
# udsbr* at uhub? # D-Link DSB-R100 radio
# radio* at udsbr? # USB radio
# #ubt* at uhub? disable # USB Bluetooth
-# ugen* at uhub? # USB Generic driver
-#
-# ukphy* at mii? # "unknown" PHYs
+ugen* at uhub? # USB Generic driver
#
+ukphy* at mii? # "unknown" PHYs
+
scsibus* at scsi?
sd* at scsibus?
st* at scsibus?
@@ -178,6 +181,7 @@ sdmmc* at ommmc? # SD/MMC bus
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ram disk
+pseudo-device hotplug 1 # devices hot plugging
# RAMDISK stuff
options MINIROOTSIZE=5120