[src/trunk]: src/sys/arch/evbppc/conf Add dwctwo and umass.

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

details:   https://anonhg.NetBSD.org/src/rev/b29863e4e8ad
branches:  trunk
changeset: 791499:b29863e4e8ad
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Thu Nov 21 14:03:02 2013 +0000

description:
Add dwctwo and umass.
And cleanup.
However dwctwo@plb is buggy...

diffstat:

 sys/arch/evbppc/conf/OPENBLOCKS600 |  26 ++++++++++++++++++++++----
 sys/arch/evbppc/conf/files.obs600  |   4 +++-
 sys/arch/evbppc/conf/std.obs600    |   4 +++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diffs (110 lines):

diff -r 346a14a7e488 -r b29863e4e8ad sys/arch/evbppc/conf/OPENBLOCKS600
--- a/sys/arch/evbppc/conf/OPENBLOCKS600        Thu Nov 21 13:52:27 2013 +0000
+++ b/sys/arch/evbppc/conf/OPENBLOCKS600        Thu Nov 21 14:03:02 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: OPENBLOCKS600,v 1.15 2013/06/30 21:38:56 rmind Exp $
+#      $NetBSD: OPENBLOCKS600,v 1.16 2013/11/21 14:03:02 kiyohara Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "OPENBLOCKS600-$Revision: 1.15 $"
+#ident                 "OPENBLOCKS600-$Revision: 1.16 $"
 
 maxusers       32
 
@@ -42,7 +42,7 @@
 options        DDB                     # in-kernel debugger
 options        DDB_HISTORY_SIZE=512    # enable history editing in DDB
 options        TRAP_PANICWAIT
-options        SYMTAB_SPACE=410000     # size for embedded symbol table
+options        SYMTAB_SPACE=430000     # size for embedded symbol table
 
 makeoptions    DEBUG="-g"              # compile full symbol table
 
@@ -129,6 +129,10 @@
 #options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+#options       SCSIVERBOSE     # human readable SCSI error messages
+#options       USBVERBOSE      # verbose USB device autoconfig messages
 
 #
 # Kernel root file system and dump configuration.
@@ -144,6 +148,7 @@
 plb0 at root                           # Processor Local Bus
 cpu0   at plb?                         # CPU
 ecc0   at plb? irq 17                  # On-chip ECC controller
+dwctwo at plb? addr 0xef6c0000 irq 94  # On-chip USB controller
 
 # On-chip Peripheral Bus support
 opb*   at plb?                         # On-chip Peripheral Bus
@@ -152,15 +157,28 @@
 emac*  at opb? addr ? irq ?            # Ethernet Media Access Controller
 options        EMAC_EVENT_COUNTERS
 options        EMAC_RGMII_PHY
+
 gpiic* at opb? addr ? irq ?            # On-chip IIC controller
 iic*   at gpiic?                       # I2C bus
 m41trtc0 at iic? addr 0x68             # Dallas DS1340C Real Time Clock
+
 opbgpio0 at opb? addr ? irq ?          # On-chip GPIO controller
 gpio*  at opbgpio?                     # GPIO framework
 
+# USB bus support
+usb*   at dwctwo?
+
+# USB Hubs
+uhub*  at usb?
+uhub*  at uhub? port ?
+
+# USB Mass Storage
+umass* at uhub? port ? configuration ? interface ?
+scsibus* at umass?
+sd*    at scsibus? target ? lun ?      # SCSI disk drives
+
 # MII/PHY support
 brgphy*        at mii? phy ?                   # Broadcom BCM5400-family PHYs
-options        MIIVERBOSE              # verbose PHY autoconfig messages
 
 
 #
diff -r 346a14a7e488 -r b29863e4e8ad sys/arch/evbppc/conf/files.obs600
--- a/sys/arch/evbppc/conf/files.obs600 Thu Nov 21 13:52:27 2013 +0000
+++ b/sys/arch/evbppc/conf/files.obs600 Thu Nov 21 14:03:02 2013 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: files.obs600,v 1.1 2010/03/18 14:15:38 kiyohara Exp $
+#      $NetBSD: files.obs600,v 1.2 2013/11/21 14:03:02 kiyohara Exp $
 #
 # obs600-specific configuration info
 
 file   arch/evbppc/obs405/obs600_autoconf.c
 file   arch/evbppc/obs405/obs600_machdep.c
 
+file   kern/subr_disk_mbr.c                    disk
+
 include "dev/usb/files.usb"
 
 include "dev/bluetooth/files.bluetooth"
diff -r 346a14a7e488 -r b29863e4e8ad sys/arch/evbppc/conf/std.obs600
--- a/sys/arch/evbppc/conf/std.obs600   Thu Nov 21 13:52:27 2013 +0000
+++ b/sys/arch/evbppc/conf/std.obs600   Thu Nov 21 14:03:02 2013 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: std.obs600,v 1.1 2010/03/18 14:15:38 kiyohara Exp $
+#      $NetBSD: std.obs600,v 1.2 2013/11/21 14:03:02 kiyohara Exp $
 #
 # Standard/required options for obs600.
 
 include                "arch/evbppc/conf/std.obs405"
 options        MULTIUIC
 
+options        EVBPPC_HAS_MBR
+
 makeoptions    PRDCTTYPE="obs600"
 makeoptions    TEXTADDR=0x25000
 options        KERNBASE=0x25000