Module Name: src
Committed By: matt
Date: Tue Aug 2 00:35:06 UTC 2011
Modified Files:
src/sys/arch/evbppc/conf [matt-nb5-pq3]: MPC8536DS
src/sys/arch/powerpc/conf [matt-nb5-pq3]: files.booke
Log Message:
Change pq3cfi to cfi
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/evbppc/conf/MPC8536DS
cvs rdiff -u -r1.1.8.3 -r1.1.8.4 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.1.2.3 src/sys/arch/evbppc/conf/MPC8536DS:1.1.2.4
--- src/sys/arch/evbppc/conf/MPC8536DS:1.1.2.3 Tue Jul 26 03:45:15 2011
+++ src/sys/arch/evbppc/conf/MPC8536DS Tue Aug 2 00:35:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8536DS,v 1.1.2.3 2011/07/26 03:45:15 matt Exp $
+# $NetBSD: MPC8536DS,v 1.1.2.4 2011/08/02 00:35:06 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.1.2.3 $"
+ident "MPC8536DS-$Revision: 1.1.2.4 $"
maxusers 32
@@ -153,8 +153,8 @@
# 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
Index: src/sys/arch/powerpc/conf/files.booke
diff -u src/sys/arch/powerpc/conf/files.booke:1.1.8.3 src/sys/arch/powerpc/conf/files.booke:1.1.8.4
--- src/sys/arch/powerpc/conf/files.booke:1.1.8.3 Tue Jul 26 03:38:48 2011
+++ src/sys/arch/powerpc/conf/files.booke Tue Aug 2 00:35:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.booke,v 1.1.8.3 2011/07/26 03:38:48 matt Exp $
+# $NetBSD: files.booke,v 1.1.8.4 2011/08/02 00:35:06 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 rng
attach rng at cpunode with pq3rng
