[src/trunk]: src/sys/arch/evbmips/conf pull in intr.c, attach apbus

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/da487ad6533b
branches:  trunk
changeset: 804919:da487ad6533b
user:      macallan <macallan%NetBSD.org@localhost>
date:      Sat Dec 06 14:31:27 2014 +0000

description:
pull in intr.c, attach apbus

diffstat:

 sys/arch/evbmips/conf/CI20          |   8 ++++----
 sys/arch/evbmips/conf/files.ingenic |  13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (55 lines):

diff -r 103ee1d6aed0 -r da487ad6533b sys/arch/evbmips/conf/CI20
--- a/sys/arch/evbmips/conf/CI20        Sat Dec 06 14:30:11 2014 +0000
+++ b/sys/arch/evbmips/conf/CI20        Sat Dec 06 14:31:27 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CI20,v 1.3 2014/11/25 04:55:13 macallan Exp $
+#      $NetBSD: CI20,v 1.4 2014/12/06 14:31:27 macallan Exp $
 #
 # MIPS Creator CI20
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "CI20-$Revision: 1.3 $"
+#ident                 "CI20-$Revision: 1.4 $"
 
 maxusers       32
 
@@ -133,10 +133,10 @@
 cpu0           at mainbus?
 #wdog0         at mainbus?
 com*           at mainbus?
-#apbus0        at mainbus?
+apbus0         at mainbus?
 
 # On-board USB
-#dwctwo*       at apbus?
+#dwctwo*       at apbus? addr 0x13500000
 #usb*          at dwctwo?
 #uhub*         at usb?
 #uhub*         at uhub? port ?
diff -r 103ee1d6aed0 -r da487ad6533b sys/arch/evbmips/conf/files.ingenic
--- a/sys/arch/evbmips/conf/files.ingenic       Sat Dec 06 14:30:11 2014 +0000
+++ b/sys/arch/evbmips/conf/files.ingenic       Sat Dec 06 14:31:27 2014 +0000
@@ -1,13 +1,14 @@
-#      $NetBSD: files.ingenic,v 1.1 2014/11/22 15:17:02 macallan Exp $
+#      $NetBSD: files.ingenic,v 1.2 2014/12/06 14:31:27 macallan Exp $
+
 
-#file  arch/evbmips/ingenic/intr.c
+file   arch/mips/mips/bus_dma.c
+
+file   arch/evbmips/evbmips/disksubr.c
+file   arch/evbmips/evbmips/interrupt.c
 
 file   arch/evbmips/ingenic/autoconf.c
 file   arch/evbmips/ingenic/machdep.c
-
-file   arch/mips/mips/bus_dma.c
-file   arch/evbmips/evbmips/disksubr.c
-file   arch/evbmips/evbmips/interrupt.c
+file   arch/evbmips/ingenic/intr.c
 file   arch/evbmips/ingenic/clock.c
 
 # System bus