Module Name:    src
Committed By:   martin
Date:           Wed Nov 12 19:54:46 UTC 2014

Modified Files:
        src/etc/etc.evbarm [netbsd-7]: Makefile.inc
        src/sys/arch/evbarm/conf [netbsd-7]: BPI CUBIEBOARD CUBIETRUCK mk.awin
            std.awin
        src/sys/conf [netbsd-7]: files
        src/sys/dev/usb [netbsd-7]: motg.c motgvar.h
Added Files:
        src/sys/arch/evbarm/conf [netbsd-7]: BPI_INSTALL

Log Message:
Pull up following revision(s) (requested by skrll in ticket #222):
        etc/etc.evbarm/Makefile.inc                     1.64
        sys/arch/evbarm/conf/BPI                        1.2,1.4,1.6-1.7,1.9
        sys/arch/evbarm/conf/BPI_INSTALL                1.1
        sys/arch/evbarm/conf/CUBIEBOARD                 1.18-1.30
        sys/arch/evbarm/conf/CUBIETRUCK                 1.4,1.6
        sys/arch/evbarm/conf/mk.awin                    1.4
        sys/arch/evbarm/conf/std.awin                   1.4 (via patch)
        sys/conf/files                                  1.1104
        sys/dev/usb/motg.c                              1.9-1.12
        sys/dev/usb/motgreg.h                           1.2-1.4
Allow attachment glue to override the number of endpoints
-
options MOTG_ALLWINNER to select the awin specific reg layout
options MOTG_ALLWINNER
-
Instead of polluting motgreg.h with AllWinner specific registers (things
were getting out of hand), move the AllWinner reg definitions to
arch/arm/allwinner/awin_otgreg.h and include that instead of
dev/usb/motgreg.h when MOTG_ALLWINNER is defined.
let the bus driver override fifo size
-
If the bus driver supplies a fifo size and dynfifo is true, use it
-
Various kernel config fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.2.1 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.2.2.3 -r1.2.2.4 src/sys/arch/evbarm/conf/BPI
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/evbarm/conf/BPI_INSTALL
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/sys/arch/evbarm/conf/CUBIETRUCK
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/evbarm/conf/mk.awin
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/evbarm/conf/std.awin
cvs rdiff -u -r1.1096.2.2 -r1.1096.2.3 src/sys/conf/files
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/dev/usb/motgvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.63 src/etc/etc.evbarm/Makefile.inc:1.63.2.1
--- src/etc/etc.evbarm/Makefile.inc:1.63	Fri Jul 25 11:22:50 2014
+++ src/etc/etc.evbarm/Makefile.inc	Wed Nov 12 19:54:46 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.63 2014/07/25 11:22:50 hkenken Exp $
+#	$NetBSD: Makefile.inc,v 1.63.2.1 2014/11/12 19:54:46 martin Exp $
 #
 #	etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -21,6 +21,8 @@ EVBARM_BOARDS.armv7+=		BCM5301X
 EVBARM_BOARDS.armv7hf+=		BCM5301X
 #EVBARM_BOARDS.armv7+=		BCM56340
 #EVBARM_BOARDS.armv7hf+= 	BCM56340
+EVBARM_BOARDS.armv7+=		BPI
+EVBARM_BOARDS.armv7hf+=		BPI
 EVBARM_BOARDS.armv7+=		CUBIEBOARD
 EVBARM_BOARDS.armv7hf+=		CUBIEBOARD
 .else
@@ -78,6 +80,8 @@ EVBARM_BOARDS.armv7+=		BEAGLEBOARDXM
 EVBARM_BOARDS.armv7hf+= 	BEAGLEBOARDXM
 EVBARM_BOARDS.armv7+=		BEAGLEBONE
 EVBARM_BOARDS.armv7hf+= 	BEAGLEBONE
+EVBARM_BOARDS.armv7+=		BPI
+EVBARM_BOARDS.armv7hf+= 	BPI
 EVBARM_BOARDS.armv7+=		CUBIEBOARD
 EVBARM_BOARDS.armv7hf+= 	CUBIEBOARD
 #EVBARM_BOARDS.armv7+=		IGEPV2

Index: src/sys/arch/evbarm/conf/BPI
diff -u src/sys/arch/evbarm/conf/BPI:1.2.2.3 src/sys/arch/evbarm/conf/BPI:1.2.2.4
--- src/sys/arch/evbarm/conf/BPI:1.2.2.3	Sun Nov  9 16:05:25 2014
+++ src/sys/arch/evbarm/conf/BPI	Wed Nov 12 19:54:46 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BPI,v 1.2.2.3 2014/11/09 16:05:25 martin Exp $
+#	$NetBSD: BPI,v 1.2.2.4 2014/11/12 19:54:46 martin Exp $
 #
 #	BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel
 #
@@ -17,6 +17,8 @@ options 	RTC_OFFSET=0	# hardware clock i
 
 # CPU options
 
+no makeoptions	CPUFLAGS
+makeoptions	CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
 no makeoptions	BOARDTYPE
 makeoptions	BOARDTYPE="bpi"
 #options 	UVMHIST,UVMHIST_PRINT
@@ -86,20 +88,20 @@ options		NFS_BOOT_RWSIZE=1024
 
 options		COMPAT_NETBSD32	# allow running arm (e.g. non-earm) binaries
 #options 	COMPAT_43	# 4.3BSD compatibility.
-options 	COMPAT_70	# NetBSD 7.0 compatibility.
-options 	COMPAT_60	# NetBSD 6.0 compatibility.
-options 	COMPAT_50	# NetBSD 5.0 compatibility.
-options 	COMPAT_40	# NetBSD 4.0 compatibility.
-options 	COMPAT_30	# NetBSD 3.0 compatibility.
-#options 	COMPAT_20	# NetBSD 2.0 compatibility.
-#options 	COMPAT_16	# NetBSD 1.6 compatibility.
-#options 	COMPAT_15	# NetBSD 1.5 compatibility.
-#options 	COMPAT_14	# NetBSD 1.4 compatibility.
-#options 	COMPAT_13	# NetBSD 1.3 compatibility.
-#options 	COMPAT_12	# NetBSD 1.2 compatibility.
-#options 	COMPAT_11	# NetBSD 1.1 compatibility.
-#options 	COMPAT_10	# NetBSD 1.0 compatibility.
-#options 	COMPAT_09	# NetBSD 0.9 compatibility.
+#options 	COMPAT_09	# NetBSD 0.9,
+#options 	COMPAT_10	# NetBSD 1.0,
+#options 	COMPAT_11	# NetBSD 1.1,
+#options 	COMPAT_12	# NetBSD 1.2,
+#options 	COMPAT_13	# NetBSD 1.3,
+#options 	COMPAT_14	# NetBSD 1.4,
+#options 	COMPAT_15	# NetBSD 1.5,
+#options 	COMPAT_16	# NetBSD 1.6,
+#options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0,
+options 	COMPAT_40	# NetBSD 4.0,
+options 	COMPAT_50	# NetBSD 5.0,
+options 	COMPAT_60	# NetBSD 6.0, and
+options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 #options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
@@ -130,6 +132,11 @@ options 	KTRACE		# system call tracing, 
 #options 	USERCONF	# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
+#options 	BUFQ_READPRIO
+options 	BUFQ_PRIOCSCAN
+
 # Development and Debugging options
 
 #options 	PERFCTRS	# performance counters
@@ -223,6 +230,7 @@ gpio*		at awingpio?
 awiniic0	at awinio? port 0
 #awiniic*	at awinio? port ?
 iic*		at awiniic?
+#axp20x0 	at iic0 addr 0x34	# AXP209 Power Management Unit
 
 # On-board 16550 UARTs
 com0		at awinio? port 0			# UART0 (console)
@@ -234,6 +242,12 @@ awintmr0	at awinio?
 # Watchdog timers
 awinwdt*	at awinio?
 
+# RTC
+awinrtc*	at awinio?
+
+# 64-bit counter
+awincnt0	at awinio0
+
 # onboard audio codec
 awinac0		at awinio0
 audio0		at awinac0
@@ -271,6 +285,10 @@ ehci*		at awinusb?
 usb*		at ohci?
 usb*		at ehci?
 
+# USB OTG
+motg0		at awinio0
+usb*		at motg?
+
 # SATA
 ahcisata*	at awinio0
 atabus*		at ata?
@@ -284,6 +302,7 @@ awge0		at awinio0 port ?
 include "dev/usb/usbdevices.config"
 
 rlphy*		at mii? phy ?
+rgephy* 	at mii? phy ?
 ukphy*		at mii? phy ?
 
 # Pseudo-Devices

Index: src/sys/arch/evbarm/conf/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.12.2.1 src/sys/arch/evbarm/conf/CUBIEBOARD:1.12.2.2
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.12.2.1	Wed Sep 10 09:37:51 2014
+++ src/sys/arch/evbarm/conf/CUBIEBOARD	Wed Nov 12 19:54:46 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: CUBIEBOARD,v 1.12.2.1 2014/09/10 09:37:51 martin Exp $
+#	$NetBSD: CUBIEBOARD,v 1.12.2.2 2014/11/12 19:54:46 martin Exp $
 #
 #	CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
 #
@@ -129,6 +129,11 @@ options 	KTRACE		# system call tracing, 
 #options 	USERCONF	# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
+#options 	BUFQ_READPRIO
+options 	BUFQ_PRIOCSCAN
+
 # Development and Debugging options
 
 #options 	PERFCTRS	# performance counters
@@ -165,7 +170,8 @@ config		netbsd		root on ? type ?
 # The main bus device
 mainbus0	at root
 
-# The boot cpu
+# CPU(s)
+options 	MULTIPROCESSOR
 cpu*		at mainbus?
 
 # Specify the memory size in megabytes (optional).
@@ -203,6 +209,14 @@ flash4		at nand0 offset 0x680000 size 0	
 
 # Interrupt Controller
 awinicu0	at awinio0 
+
+# DMA Controller
+awindma0	at awinio0
+
+# 64-bit counter
+awincnt0	at awinio0
+
+# GPIO Controller
 awingpio0	at awinio0
 
 gpio*		at awingpio?
@@ -214,6 +228,7 @@ gpio*		at awingpio?
 awiniic0	at awinio? port 0
 #awiniic*	at awinio? port ?
 iic*		at awiniic?
+#axp20x0 	at iic0 addr 0x34	# AXP209 Power Management Unit
 
 # On-board 16550 UARTs
 com0		at awinio? port 0			# UART0 (console)
@@ -225,8 +240,12 @@ awintmr0	at awinio?
 # Watchdog timers
 awinwdt*	at awinio?
 
-# onboard DMA
-#awindma0	at obio0 addr 0x48056000 size 0x1000
+# RTC
+awinrtc*	at awinio?
+
+# onboard audio codec
+awinac0		at awinio0
+audio0		at awinac0
 
 # onboard video
 #awinfb* 	at obio0 addr 0x48050000 size 0x10000
@@ -261,6 +280,10 @@ ehci*		at awinusb?
 usb*		at ohci?
 usb*		at ehci?
 
+# USB OTG
+motg0		at awinio0
+usb*		at motg?
+
 # SATA
 ahcisata*	at awinio0
 atabus*		at ata?
@@ -274,6 +297,7 @@ awge0		at awinio0 port ?
 include "dev/usb/usbdevices.config"
 
 rlphy*		at mii? phy ?
+rgephy* 	at mii? phy ?
 ukphy*		at mii? phy ?
 
 # Pseudo-Devices

Index: src/sys/arch/evbarm/conf/CUBIETRUCK
diff -u src/sys/arch/evbarm/conf/CUBIETRUCK:1.2.4.2 src/sys/arch/evbarm/conf/CUBIETRUCK:1.2.4.3
--- src/sys/arch/evbarm/conf/CUBIETRUCK:1.2.4.2	Sun Nov  9 16:05:25 2014
+++ src/sys/arch/evbarm/conf/CUBIETRUCK	Wed Nov 12 19:54:46 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: CUBIETRUCK,v 1.2.4.2 2014/11/09 16:05:25 martin Exp $
+#	$NetBSD: CUBIETRUCK,v 1.2.4.3 2014/11/12 19:54:46 martin Exp $
 #
 #	CUBIETRUCK - Cubieboard3 (mostly cubieboard2 with 2GB)
 #
@@ -16,10 +16,16 @@ makeoptions	KERNEL_BASE_VIRT="0x80000000
 makeoptions	BOARDTYPE="cubietruck"
 
 #
+# Cubietruck is an A20
+#
+no options 	ALLWINNER_A10
+no options 	CPU_CORTEXA8
+no makeoptions	CPUFLAGS
+makeoptions	CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
+
+#
 # We need this too.
 #
 options 	PMAP_NEED_ALLOC_POOLPAGE
 
-options	MULTIPROCESSOR
-cpu* at mainbus?
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages

Index: src/sys/arch/evbarm/conf/mk.awin
diff -u src/sys/arch/evbarm/conf/mk.awin:1.2.2.2 src/sys/arch/evbarm/conf/mk.awin:1.2.2.3
--- src/sys/arch/evbarm/conf/mk.awin:1.2.2.2	Wed Sep 10 09:37:51 2014
+++ src/sys/arch/evbarm/conf/mk.awin	Wed Nov 12 19:54:46 2014
@@ -1,5 +1,4 @@
-#	$NetBSD: mk.awin,v 1.2.2.2 2014/09/10 09:37:51 martin Exp $
-CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
+#	$NetBSD: mk.awin,v 1.2.2.3 2014/11/12 19:54:46 martin Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8

Index: src/sys/arch/evbarm/conf/std.awin
diff -u src/sys/arch/evbarm/conf/std.awin:1.1.2.2 src/sys/arch/evbarm/conf/std.awin:1.1.2.3
--- src/sys/arch/evbarm/conf/std.awin:1.1.2.2	Wed Sep 10 09:37:51 2014
+++ src/sys/arch/evbarm/conf/std.awin	Wed Nov 12 19:54:46 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: std.awin,v 1.1.2.2 2014/09/10 09:37:51 martin Exp $
+#	$NetBSD: std.awin,v 1.1.2.3 2014/11/12 19:54:46 martin Exp $
 #
 # standard NetBSD/evbarm for Allwinner based options
 
@@ -19,6 +19,7 @@ options 	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 options 	TPIDRPRW_IS_CURCPU
 options 	KERNEL_BASE_EXT=0x80000000
 options 	FPU_VFP
+options 	MOTG_ALLWINNER
 
 makeoptions	KERNEL_BASE_PHYS="0x40007800"
 makeoptions	KERNEL_BASE_VIRT="0x80007800"

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1096.2.2 src/sys/conf/files:1.1096.2.3
--- src/sys/conf/files:1.1096.2.2	Sun Nov  9 20:59:34 2014
+++ src/sys/conf/files	Wed Nov 12 19:54:46 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1096.2.2 2014/11/09 20:59:34 snj Exp $
+#	$NetBSD: files,v 1.1096.2.3 2014/11/12 19:54:46 martin Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -1244,6 +1244,7 @@ device	xhci: usbus, usbroothub, usb_dma
 file	dev/usb/xhci.c			xhci			needs-flag
 
 # Mentor graphics OTG IP
+defflag	opt_motg.h	MOTG_ALLWINNER
 device	motg: usbus, usbroothub, usb_dma
 file	dev/usb/motg.c			motg			needs-flag
 

Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.6.4.1 src/sys/dev/usb/motg.c:1.6.4.2
--- src/sys/dev/usb/motg.c:1.6.4.1	Tue Aug 12 10:22:54 2014
+++ src/sys/dev/usb/motg.c	Wed Nov 12 19:54:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: motg.c,v 1.6.4.1 2014/08/12 10:22:54 martin Exp $	*/
+/*	$NetBSD: motg.c,v 1.6.4.2 2014/11/12 19:54:46 martin Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -39,8 +39,10 @@
  * NOTE: The current implementation only supports Device Side Mode!
  */
 
+#include "opt_motg.h"
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.1 2014/08/12 10:22:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.2 2014/11/12 19:54:46 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,7 +64,12 @@ __KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usb_quirks.h>
 
+#ifdef MOTG_ALLWINNER
+#include <arch/arm/allwinner/awin_otgreg.h>
+#else
 #include <dev/usb/motgreg.h>
+#endif
+
 #include <dev/usb/motgvar.h>
 #include <dev/usb/usbroothub_subr.h>
 
@@ -261,9 +268,11 @@ motg_init(struct motg_softc *sc)
 
 	musbotg_pull_common(sc, 0);
 
+#ifdef MUSB2_REG_RXDBDIS
 	/* disable double packet buffering XXX what's this ? */
 	UWRITE2(sc, MUSB2_REG_RXDBDIS, 0xFFFF);
 	UWRITE2(sc, MUSB2_REG_TXDBDIS, 0xFFFF);
+#endif
 
 	/* enable HighSpeed and ISO Update flags */
 
@@ -288,24 +297,30 @@ motg_init(struct motg_softc *sc)
 
 	UWRITE1(sc, MUSB2_REG_TESTMODE, 0);
 
+#ifdef MUSB2_REG_MISC
 	/* set default value */
 
 	UWRITE1(sc, MUSB2_REG_MISC, 0);
+#endif
 
 	/* select endpoint index 0 */
 
 	UWRITE1(sc, MUSB2_REG_EPINDEX, 0);
 
-	/* read out number of endpoints */
-	nrx = (UREAD1(sc, MUSB2_REG_EPINFO) / 16);
+	if (sc->sc_ep_max == 0) {
+		/* read out number of endpoints */
+		nrx = (UREAD1(sc, MUSB2_REG_EPINFO) / 16);
 
-	ntx = (UREAD1(sc, MUSB2_REG_EPINFO) % 16);
+		ntx = (UREAD1(sc, MUSB2_REG_EPINFO) % 16);
 
-	/* these numbers exclude the control endpoint */
+		/* these numbers exclude the control endpoint */
 
-	DPRINTF(("RX/TX endpoints: %u/%u\n", nrx, ntx));
+		DPRINTF(("RX/TX endpoints: %u/%u\n", nrx, ntx));
 
-	sc->sc_ep_max = MAX(nrx, ntx);
+		sc->sc_ep_max = MAX(nrx, ntx);
+	} else {
+		nrx = ntx = sc->sc_ep_max;
+	}
 	if (sc->sc_ep_max == 0) {
 		aprint_error_dev(sc->sc_dev, " no endpoints\n");
 		return USBD_INVAL;
@@ -338,20 +353,28 @@ motg_init(struct motg_softc *sc)
 		/* select endpoint */
 		UWRITE1(sc, MUSB2_REG_EPINDEX, i);
 
-		val = UREAD1(sc, MUSB2_REG_FSIZE);
-		fiforx_size = (val & MUSB2_MASK_RX_FSIZE) >> 4;
-		fifotx_size = (val & MUSB2_MASK_TX_FSIZE);
+		if (sc->sc_ep_fifosize) {
+			fiforx_size = fifotx_size = sc->sc_ep_fifosize;
+		} else {
+			val = UREAD1(sc, MUSB2_REG_FSIZE);
+			fiforx_size = (val & MUSB2_MASK_RX_FSIZE) >> 4;
+			fifotx_size = (val & MUSB2_MASK_TX_FSIZE);
+		}
 
 		DPRINTF(("Endpoint %u FIFO size: IN=%u, OUT=%u, DYN=%d\n",
 		    i, fifotx_size, fiforx_size, dynfifo));
 
 		if (dynfifo) {
-			if (i < 3) {
-				fifo_size = 12;       /* 4K */
-			} else if (i < 10) {
-				fifo_size = 10;       /* 1K */
+			if (sc->sc_ep_fifosize) {
+				fifo_size = ffs(sc->sc_ep_fifosize) - 1;
 			} else {
-				fifo_size = 7;        /* 128 bytes */
+				if (i < 3) {
+					fifo_size = 12;       /* 4K */
+				} else if (i < 10) {
+					fifo_size = 10;       /* 1K */
+				} else {
+					fifo_size = 7;        /* 128 bytes */
+				}
 			}
 			if (fiforx_size && (i <= nrx)) {
 				fiforx_size = fifo_size;
@@ -643,7 +666,7 @@ motg_softintr(void *v)
 	tx_status |= UREAD2(sc, MUSB2_REG_INTTX);
 
 	if (rx_status & 0x01)
-		panic("ctrl_rx");
+		panic("ctrl_rx %08x", rx_status);
 	if (tx_status & 0x01)
 		motg_device_ctrl_intr_tx(sc);
 	for (i = 1; i <= sc->sc_ep_max; i++) {

Index: src/sys/dev/usb/motgvar.h
diff -u src/sys/dev/usb/motgvar.h:1.2 src/sys/dev/usb/motgvar.h:1.2.4.1
--- src/sys/dev/usb/motgvar.h:1.2	Thu Jul 17 19:58:18 2014
+++ src/sys/dev/usb/motgvar.h	Wed Nov 12 19:54:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: motgvar.h,v 1.2 2014/07/17 19:58:18 bouyer Exp $	*/
+/*	$NetBSD: motgvar.h,v 1.2.4.1 2014/11/12 19:54:46 martin Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -75,12 +75,13 @@ struct motg_softc {
 #define MOTG_MODE_DEVICE 1
 	void (*sc_intr_poll)(void *);
 	void *sc_intr_poll_arg;
+	int sc_ep_max;
+	u_int sc_ep_fifosize;
 
 	uint16_t sc_intr_tx_ep;
 	uint16_t sc_intr_rx_ep;
 	uint8_t  sc_intr_ctrl;
 
-	int sc_ep_max;
 	struct motg_hw_ep sc_in_ep[MOTG_MAX_HW_EP];
 	struct motg_hw_ep sc_out_ep[MOTG_MAX_HW_EP];
 

Added files:

Index: src/sys/arch/evbarm/conf/BPI_INSTALL
diff -u /dev/null src/sys/arch/evbarm/conf/BPI_INSTALL:1.1.2.2
--- /dev/null	Wed Nov 12 19:54:46 2014
+++ src/sys/arch/evbarm/conf/BPI_INSTALL	Wed Nov 12 19:54:46 2014
@@ -0,0 +1,10 @@
+#	$NetBSD: BPI_INSTALL,v 1.1.2.2 2014/11/12 19:54:46 martin Exp $
+#
+#	BPI_INSTALL -- BPI kernel with installation-sized ramdisk
+#
+
+include "arch/evbarm/conf/BPI"
+include "arch/evbarm/conf/INSTALL"
+
+options BOOTHOWTO=RB_SINGLE
+no makeoptions	DEBUG

Reply via email to