[src/trunk]: src/sys/arch Change device name of pq3cfi to cfi.

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

details:   https://anonhg.NetBSD.org/src/rev/47800078f6f2
branches:  trunk
changeset: 767861:47800078f6f2
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Aug 02 00:27:42 2011 +0000

description:
Change device name of pq3cfi to cfi.
Add cfi to P2020DS
Add ddrc

diffstat:

 sys/arch/evbppc/conf/MPC8536DS    |   9 +++++----
 sys/arch/evbppc/conf/P2020DS      |  11 +++++++++--
 sys/arch/evbppc/conf/P2020RDB     |   9 +++++----
 sys/arch/powerpc/conf/files.booke |   8 ++++----
 4 files changed, 23 insertions(+), 14 deletions(-)

diffs (124 lines):

diff -r ed65bf270964 -r 47800078f6f2 sys/arch/evbppc/conf/MPC8536DS
--- a/sys/arch/evbppc/conf/MPC8536DS    Tue Aug 02 00:25:38 2011 +0000
+++ b/sys/arch/evbppc/conf/MPC8536DS    Tue Aug 02 00:27:42 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MPC8536DS,v 1.7 2011/07/15 19:19:55 cliff Exp $
+#      $NetBSD: MPC8536DS,v 1.8 2011/08/02 00:27:42 matt Exp $
 #
 #      MPC8536DS -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "MPC8536DS-$Revision: 1.7 $"
+ident          "MPC8536DS-$Revision: 1.8 $"
 
 maxusers       32
 
@@ -151,12 +151,13 @@
 
 # NOR Flash
 #options       NOR_VERBOSE
-pq3cfi0        at obio0 cs 0
-nor*           at pq3cfi?
+cfi0           at obio0 cs 0
+nor*           at cfi?
 flash*         at nor? offset 0 size 0x8000000
 
 e500wdog*      at cpunode?             # Watchdog timer
 
+ddrc*          at cpunode?
 duart*         at cpunode?
 com*           at duart? port ?
 options                CONSPEED=9600
diff -r ed65bf270964 -r 47800078f6f2 sys/arch/evbppc/conf/P2020DS
--- a/sys/arch/evbppc/conf/P2020DS      Tue Aug 02 00:25:38 2011 +0000
+++ b/sys/arch/evbppc/conf/P2020DS      Tue Aug 02 00:27:42 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P2020DS,v 1.8 2011/07/28 15:54:49 matt Exp $
+#      $NetBSD: P2020DS,v 1.9 2011/08/02 00:27:42 matt Exp $
 #
 #      P2020DS -- everything that's currently supported
 #
@@ -8,7 +8,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "P2020DS-$Revision: 1.8 $"
+ident          "P2020DS-$Revision: 1.9 $"
 
 maxusers       32
 
@@ -153,8 +153,15 @@
 
 obio0          at cpunode?             # On-chip Peripheral Bus
 
+# NOR Flash
+#options       NOR_VERBOSE
+cfi0           at obio0 cs 0
+nor*           at cfi?
+flash*         at nor? offset 0 size 0x8000000
+
 e500wdog*      at cpunode?             # Watchdog timer
 
+ddrc*          at cpunode?
 duart*         at cpunode?
 com*           at duart? port ?
 options                CONSPEED=115200
diff -r ed65bf270964 -r 47800078f6f2 sys/arch/evbppc/conf/P2020RDB
--- a/sys/arch/evbppc/conf/P2020RDB     Tue Aug 02 00:25:38 2011 +0000
+++ b/sys/arch/evbppc/conf/P2020RDB     Tue Aug 02 00:27:42 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P2020RDB,v 1.9 2011/07/28 15:38:48 matt Exp $
+#      $NetBSD: P2020RDB,v 1.10 2011/08/02 00:27:42 matt Exp $
 #
 #      P2020RBD -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "P2020RBD-$Revision: 1.9 $"
+ident          "P2020RBD-$Revision: 1.10 $"
 
 maxusers       32
 
@@ -154,12 +154,13 @@
 
 # NOR Flash
 #options       NOR_VERBOSE
-pq3cfi0        at obio0 cs 0
-nor*           at pq3cfi?
+cfi0           at obio0 cs 0
+nor*           at cfi?
 flash*         at nor? offset 0 size 0x1000000
 
 e500wdog*      at cpunode?             # Watchdog timer
 
+ddrc*          at cpunode?
 duart*         at cpunode?
 com*           at duart? port ?
 options                CONSADDR="DUART1_BASE"
diff -r ed65bf270964 -r 47800078f6f2 sys/arch/powerpc/conf/files.booke
--- a/sys/arch/powerpc/conf/files.booke Tue Aug 02 00:25:38 2011 +0000
+++ b/sys/arch/powerpc/conf/files.booke Tue Aug 02 00:27:42 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.booke,v 1.5 2011/07/25 23:26:03 matt Exp $
+#      $NetBSD: files.booke,v 1.6 2011/08/02 00:27:42 matt Exp $
 #
 # PPC BookE specific configuration info
 
@@ -58,9 +58,9 @@
 attach obio at cpunode with pq3obio
 file   arch/powerpc/booke/dev/pq3obio.c        pq3obio
 
-device  pq3cfi: norbus
-attach pq3cfi at obio
-file   arch/powerpc/booke/dev/pq3cfi.c         nor
+device  cfi: norbus
+attach cfi at obio with pq3cfi
+file   arch/powerpc/booke/dev/pq3cfi.c         pq3cfi
 
 device nandfcm: nandbus
 attach nandfcm at obio with pq3nandfcm