X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=bbb-usb.git;a=blobdiff_plain;f=src%2Fsys%2Farch%2Farmv7%2Fconf%2FUSB;h=b088dc3c9f8bf8446b0aa4f9e96ed6eb4875acf8;hp=43dcbd638d03180090d45c4b2c2d2b31fcd34025;hb=22caf3ce3cdfe77a11086492ccd12b933a675ae8;hpb=8d587cd8de9c1379c0e888ec21bdd4faaacea1e3

diff --git a/src/sys/arch/armv7/conf/USB b/src/sys/arch/armv7/conf/USB
index 43dcbd6..b088dc3 100644
--- a/src/sys/arch/armv7/conf/USB
+++ b/src/sys/arch/armv7/conf/USB
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.70 2017/01/03 19:57:01 kettenis Exp $
+#	$OpenBSD: GENERIC,v 1.82 2017/03/24 20:31:58 patrick Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -24,6 +24,9 @@ option WSDISPLAY_DEFAULTSCREENS=1
 option		CONF_HAVE_GPIO
 option		USBVERBOSE
 
+option		DDB_STRUCT
+option		DDB_SAFE_CONSOLE
+
 config		bsd	swap generic
 
 # The main bus device
@@ -63,7 +66,7 @@ omapid*		at omap?
 # OMAP on-chip devices
 intc*		at fdt?			# OMAP3 interrupt controller
 omwugen*	at fdt?			# Wake-up generator
-#edma*		at omap?		# OMAP3 dma controller
+#edma*		at fdt?			# OMAP3 dma controller
 prcm*		at omap?		# power/clock controller
 ompinmux*	at fdt?			# pin muxing
 omdog*		at fdt?			# watchdog timer
@@ -109,30 +112,35 @@ plrtc*		at fdt?
 virtio*		at fdt?
 
 psci*		at fdt?
+syscon*		at fdt?
 
 simplefb*	at fdt?
 wsdisplay*	at simplefb?
 
 # Exynos
-exynos0		at mainbus?
-exdisplay*	at exynos?
-wsdisplay*	at exdisplay? console ?
-exclock*	at exynos?
-expower*	at exynos?
-exsysreg*	at exynos?
-exmct*		at exynos?
-exdog*		at exynos?
-exgpio*		at exynos?
-exiic*		at exynos?
+#exdisplay*	at exynos?
+#wsdisplay*	at exdisplay? console ?
+exclock*	at fdt? early 1
+expower*	at fdt? early 1
+exsysreg*	at fdt? early 1
+exmct*		at fdt? early 1
+exdog*		at fdt?
+exgpio*		at fdt? early 1
+exiic*		at fdt?
 iic*		at exiic?
-exehci*		at exynos?
-ehci*		at exehci?
-exesdhc*	at exynos?
+exehci*		at fdt?
+usb*		at exehci?
+exdwusb*	at fdt?
+xhci*		at fdt?
+usb*		at xhci?
+exesdhc*	at fdt?
 sdmmc*		at exesdhc?
+exrtc*		at fdt?
 exuart*		at fdt?
 
 # Raspberry Pi 2/3
 bcmintc*	at fdt?
+bcmdog*		at fdt?
 dwctwo*		at fdt?
 usb*		at dwctwo?
 
@@ -141,6 +149,9 @@ mvacc*		at fdt? early 1
 mvagc*		at fdt?
 mvsysctrl*	at fdt?
 mvmbus*		at fdt?
+mvxhci*		at fdt?
+usb*		at mvxhci?
+mvahci*		at fdt?
 
 crosec*		at iic?
 wskbd*		at crosec? mux 1