Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by skrll in tick...
details: https://anonhg.NetBSD.org/src/rev/a628d73609ea
branches: netbsd-7
changeset: 798556:a628d73609ea
user: martin <martin%NetBSD.org@localhost>
date: Wed Nov 12 19:54:46 2014 +0000
description:
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.
diffstat:
etc/etc.evbarm/Makefile.inc | 6 +++-
sys/arch/evbarm/conf/BPI | 49 +++++++++++++++++++++++----------
sys/arch/evbarm/conf/BPI_INSTALL | 10 ++++++
sys/arch/evbarm/conf/CUBIEBOARD | 32 ++++++++++++++++++--
sys/arch/evbarm/conf/CUBIETRUCK | 12 ++++++--
sys/arch/evbarm/conf/mk.awin | 3 +-
sys/arch/evbarm/conf/std.awin | 3 +-
sys/conf/files | 3 +-
sys/dev/usb/motg.c | 59 +++++++++++++++++++++++++++------------
sys/dev/usb/motgvar.h | 5 ++-
10 files changed, 135 insertions(+), 47 deletions(-)
diffs (truncated from 462 to 300 lines):
diff -r 9b7a214a97af -r a628d73609ea etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc Wed Nov 12 19:24:25 2014 +0000
+++ b/etc/etc.evbarm/Makefile.inc Wed Nov 12 19:54:46 2014 +0000
@@ -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.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.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
diff -r 9b7a214a97af -r a628d73609ea sys/arch/evbarm/conf/BPI
--- a/sys/arch/evbarm/conf/BPI Wed Nov 12 19:24:25 2014 +0000
+++ b/sys/arch/evbarm/conf/BPI Wed Nov 12 19:54:46 2014 +0000
@@ -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 @@
# 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 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 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 @@
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 @@
# 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 @@
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 @@
include "dev/usb/usbdevices.config"
rlphy* at mii? phy ?
+rgephy* at mii? phy ?
ukphy* at mii? phy ?
# Pseudo-Devices
diff -r 9b7a214a97af -r a628d73609ea sys/arch/evbarm/conf/BPI_INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/conf/BPI_INSTALL Wed Nov 12 19:54:46 2014 +0000
@@ -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
diff -r 9b7a214a97af -r a628d73609ea sys/arch/evbarm/conf/CUBIEBOARD
--- a/sys/arch/evbarm/conf/CUBIEBOARD Wed Nov 12 19:24:25 2014 +0000
+++ b/sys/arch/evbarm/conf/CUBIEBOARD Wed Nov 12 19:54:46 2014 +0000
@@ -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 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 @@
# 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 @@
# 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 @@
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 @@
# 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 @@
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 @@
include "dev/usb/usbdevices.config"
rlphy* at mii? phy ?
+rgephy* at mii? phy ?
ukphy* at mii? phy ?
# Pseudo-Devices
diff -r 9b7a214a97af -r a628d73609ea sys/arch/evbarm/conf/CUBIETRUCK
--- a/sys/arch/evbarm/conf/CUBIETRUCK Wed Nov 12 19:24:25 2014 +0000
+++ b/sys/arch/evbarm/conf/CUBIETRUCK Wed Nov 12 19:54:46 2014 +0000
@@ -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 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
diff -r 9b7a214a97af -r a628d73609ea sys/arch/evbarm/conf/mk.awin
--- a/sys/arch/evbarm/conf/mk.awin Wed Nov 12 19:24:25 2014 +0000
+++ b/sys/arch/evbarm/conf/mk.awin Wed Nov 12 19:54:46 2014 +0000
@@ -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
diff -r 9b7a214a97af -r a628d73609ea sys/arch/evbarm/conf/std.awin
--- a/sys/arch/evbarm/conf/std.awin Wed Nov 12 19:24:25 2014 +0000
+++ b/sys/arch/evbarm/conf/std.awin Wed Nov 12 19:54:46 2014 +0000
@@ -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 TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
+options MOTG_ALLWINNER
makeoptions KERNEL_BASE_PHYS="0x40007800"
makeoptions KERNEL_BASE_VIRT="0x80007800"
diff -r 9b7a214a97af -r a628d73609ea sys/conf/files
--- a/sys/conf/files Wed Nov 12 19:24:25 2014 +0000
+++ b/sys/conf/files Wed Nov 12 19:54:46 2014 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index