Module Name: src
Committed By: skrll
Date: Sat Sep 21 13:22:48 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: files.bcm2835
src/sys/conf: files
Log Message:
Some dwc2 glue.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/broadcom/files.bcm2835
cvs rdiff -u -r1.1079 -r1.1080 src/sys/conf/files
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/files.bcm2835
diff -u src/sys/arch/arm/broadcom/files.bcm2835:1.16 src/sys/arch/arm/broadcom/files.bcm2835:1.17
--- src/sys/arch/arm/broadcom/files.bcm2835:1.16 Sun Mar 24 19:55:19 2013
+++ src/sys/arch/arm/broadcom/files.bcm2835 Sat Sep 21 13:22:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.bcm2835,v 1.16 2013/03/24 19:55:19 jmcneill Exp $
+# $NetBSD: files.bcm2835,v 1.17 2013/09/21 13:22:48 skrll Exp $
#
# Configuration info for Broadcom BCM2835 ARM Peripherals
#
@@ -59,6 +59,10 @@ file arch/arm/broadcom/bcm2835_emmc.c bc
attach dotg at obio with dotg_amba
file arch/arm/broadcom/bcm2835_dotg.c dotg needs-flag
+# USB (BCM2835_USB_BASE)
+attach dwctwo at obio with bcmdwctwo
+file arch/arm/broadcom/bcm2835_dwctwo.c bcmdwctwo needs-flag
+
# GPIO misc. functions
define bcm2835_gpio_subr
file arch/arm/broadcom/bcm2835_gpio_subr.c bcm2835_gpio_subr
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1079 src/sys/conf/files:1.1080
--- src/sys/conf/files:1.1079 Sun Sep 8 12:51:14 2013
+++ src/sys/conf/files Sat Sep 21 13:22:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1079 2013/09/08 12:51:14 jmcneill Exp $
+# $NetBSD: files,v 1.1080 2013/09/21 13:22:48 skrll Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1213,6 +1213,10 @@ file dev/ic/sl811hs.c slhci needs-fla
device dotg: usbus, usbroothub, usb_dma
file dev/usb/dwc_otg.c dotg needs-flag
+# DesignWare HS OTG host controller
+#
+include "external/bsd/dwc2/conf/files.dwc2"
+
# USB HID processing (as used by bluetooth and usb code)
define hid
file dev/usb/hid.c hid
