Module Name: src
Committed By: matt
Date: Tue Aug 2 00:27:42 UTC 2011
Modified Files:
src/sys/arch/evbppc/conf: MPC8536DS P2020DS P2020RDB
src/sys/arch/powerpc/conf: files.booke
Log Message:
Change device name of pq3cfi to cfi.
Add cfi to P2020DS
Add ddrc
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/MPC8536DS
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/conf/P2020DS
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/P2020RDB
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/conf/files.booke
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/MPC8536DS
diff -u src/sys/arch/evbppc/conf/MPC8536DS:1.7 src/sys/arch/evbppc/conf/MPC8536DS:1.8
--- src/sys/arch/evbppc/conf/MPC8536DS:1.7 Fri Jul 15 19:19:55 2011
+++ src/sys/arch/evbppc/conf/MPC8536DS Tue Aug 2 00:27:42 2011
@@ -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
Index: src/sys/arch/evbppc/conf/P2020DS
diff -u src/sys/arch/evbppc/conf/P2020DS:1.8 src/sys/arch/evbppc/conf/P2020DS:1.9
--- src/sys/arch/evbppc/conf/P2020DS:1.8 Thu Jul 28 15:54:49 2011
+++ src/sys/arch/evbppc/conf/P2020DS Tue Aug 2 00:27:42 2011
@@ -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
Index: src/sys/arch/evbppc/conf/P2020RDB
diff -u src/sys/arch/evbppc/conf/P2020RDB:1.9 src/sys/arch/evbppc/conf/P2020RDB:1.10
--- src/sys/arch/evbppc/conf/P2020RDB:1.9 Thu Jul 28 15:38:48 2011
+++ src/sys/arch/evbppc/conf/P2020RDB Tue Aug 2 00:27:42 2011
@@ -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"
Index: src/sys/arch/powerpc/conf/files.booke
diff -u src/sys/arch/powerpc/conf/files.booke:1.5 src/sys/arch/powerpc/conf/files.booke:1.6
--- src/sys/arch/powerpc/conf/files.booke:1.5 Mon Jul 25 23:26:03 2011
+++ src/sys/arch/powerpc/conf/files.booke Tue Aug 2 00:27:42 2011
@@ -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
