Module Name: src
Committed By: matt
Date: Tue Dec 27 20:00:08 UTC 2011
Modified Files:
src/sys/arch/evbmips/conf [matt-nb5-mips64]: XLPEVB XLSATX
Log Message:
Add NOR/NAND/SPI devices (NAND only for XLSATX).
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbmips/conf/XLPEVB
cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/sys/arch/evbmips/conf/XLSATX
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/evbmips/conf/XLPEVB
diff -u src/sys/arch/evbmips/conf/XLPEVB:1.1.2.1 src/sys/arch/evbmips/conf/XLPEVB:1.1.2.2
--- src/sys/arch/evbmips/conf/XLPEVB:1.1.2.1 Sat Dec 24 01:42:48 2011
+++ src/sys/arch/evbmips/conf/XLPEVB Tue Dec 27 20:00:08 2011
@@ -1,8 +1,8 @@
-# $NetBSD: XLPEVB,v 1.1.2.1 2011/12/24 01:42:48 matt Exp $
+# $NetBSD: XLPEVB,v 1.1.2.2 2011/12/27 20:00:08 matt Exp $
include "arch/evbmips/conf/std.rmixlp"
-#ident "XLSATX-$Revision: 1.1.2.1 $"
+#ident "XLSATX-$Revision: 1.1.2.2 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -167,6 +167,14 @@ iic* at xli2c?
spdmem* at iic? addr 0x51
spdmem* at iic? addr 0x52
seeprom* at iic1 addr 0x57 size 2048
+xlnor* at pci? dev ? function ?
+cfi* at xlnor? cs ?
+nor* at cfi?
+flash* at nor?
+xlnand* at pci? dev ? function ?
+nand* at xlnand?
+flash* at nand?
+xlspi* at pci? dev ? function ?
ahcisata* at pci? dev ? function ?
siisata* at pci? dev ? function ?
atabus* at ata?
Index: src/sys/arch/evbmips/conf/XLSATX
diff -u src/sys/arch/evbmips/conf/XLSATX:1.1.2.14 src/sys/arch/evbmips/conf/XLSATX:1.1.2.15
--- src/sys/arch/evbmips/conf/XLSATX:1.1.2.14 Fri Apr 29 09:23:16 2011
+++ src/sys/arch/evbmips/conf/XLSATX Tue Dec 27 20:00:08 2011
@@ -1,8 +1,8 @@
-# $NetBSD: XLSATX,v 1.1.2.14 2011/04/29 09:23:16 matt Exp $
+# $NetBSD: XLSATX,v 1.1.2.15 2011/12/27 20:00:08 matt Exp $
include "arch/evbmips/conf/std.rmixl"
-#ident "XLSATX-$Revision: 1.1.2.14 $"
+#ident "XLSATX-$Revision: 1.1.2.15 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -146,6 +146,11 @@ obio0 at cpunode?
com0 at obio0 addr 0x14000 intr 9
com1 at obio0 addr 0x15000 intr 10
options COM_REGMAP
+xliobus0 at obio0 addr 0x19000
+xlnand* at xliobus? addr 0x01800000
+#xlnand* at xliobus? cs 2
+nand* at xlnand?
+flash* at nand?
rmixl_pcix0 at obio0
pci* at rmixl_pcix0
rmixl_pcie0 at obio0