Module Name: src
Committed By: cliff
Date: Wed Apr 7 19:31:37 UTC 2010
Modified Files:
src/sys/arch/evbmips/conf [matt-nb5-mips64]: XLSATX
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl
Log Message:
- configure XLR PCI-X interface
- this config can be used on XLS or XLR chip systems
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/evbmips/conf/XLSATX
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/arch/mips/conf/files.rmixl
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/XLSATX
diff -u src/sys/arch/evbmips/conf/XLSATX:1.1.2.6 src/sys/arch/evbmips/conf/XLSATX:1.1.2.7
--- src/sys/arch/evbmips/conf/XLSATX:1.1.2.6 Fri Jan 29 00:36:04 2010
+++ src/sys/arch/evbmips/conf/XLSATX Wed Apr 7 19:31:37 2010
@@ -1,8 +1,8 @@
-# $NetBSD: XLSATX,v 1.1.2.6 2010/01/29 00:36:04 cliff Exp $
+# $NetBSD: XLSATX,v 1.1.2.7 2010/04/07 19:31:37 cliff Exp $
include "arch/evbmips/conf/std.rmixl"
-#ident "XLSATX-$Revision: 1.1.2.6 $"
+#ident "XLSATX-$Revision: 1.1.2.7 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -75,6 +75,7 @@
#file-system PORTAL # portal filesystem (still experimental)
#file-system PROCFS # /proc
#file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system TMPFS # Efficient memory file system
#file-system UNION # union file system
#file-system MSDOSFS # MS-DOS FAT filesystem(s).
#file-system CODA # Coda File System; also needs vcoda (below)
@@ -142,6 +143,8 @@
obio0 at cpunode?
com0 at obio0 addr 0x14000 mult 4 intr 9
options COM_REGMAP
+rmixl_pcix0 at obio0
+pci* at rmixl_pcix0
rmixl_pcie0 at obio0
pci0 at rmixl_pcie0
ppb* at pci?
Index: src/sys/arch/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.10 src/sys/arch/mips/conf/files.rmixl:1.1.2.11
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.10 Sun Mar 21 21:21:41 2010
+++ src/sys/arch/mips/conf/files.rmixl Wed Apr 7 19:31:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.rmixl,v 1.1.2.10 2010/03/21 21:21:41 cliff Exp $
+# $NetBSD: files.rmixl,v 1.1.2.11 2010/04/07 19:31:37 cliff Exp $
#
# Configuration info for RMI XLP, XLR, XLS
#
@@ -31,21 +31,26 @@
file arch/mips/rmi/rmixl_obio.c obio_rmixl
file arch/mips/rmi/rmixl_obio_eb_space.c obio_rmixl
file arch/mips/rmi/rmixl_obio_el_space.c obio_rmixl
-file arch/mips/rmi/rmixl_pcie_cfg_space.c pci
-file arch/mips/rmi/rmixl_pcie_ecfg_space.c pci
-file arch/mips/rmi/rmixl_pcie_io_space.c pci
-file arch/mips/rmi/rmixl_pcie_mem_space.c pci
+file arch/mips/rmi/rmixl_pcie_cfg_space.c rmixl_pcix | rmixl_pcie
+file arch/mips/rmi/rmixl_pcie_ecfg_space.c rmixl_pcie
+file arch/mips/rmi/rmixl_pcie_io_space.c rmixl_pcix | rmixl_pcie
+file arch/mips/rmi/rmixl_pcie_mem_space.c rmixl_pcix | rmixl_pcie
# NS16550 compatible serial ports
attach com at obio with com_rmixl
file arch/mips/rmi/rmixl_com.c com_rmixl
defparam opt_com.h CONSADDR CONSFREQ CONSPEED CONMODE
-# PCI
+# PCIe
device rmixl_pcie: pcibus
attach rmixl_pcie at obio
file arch/mips/rmi/rmixl_pcie.c rmixl_pcie
+# PCI-X
+device rmixl_pcix: pcibus
+attach rmixl_pcix at obio
+file arch/mips/rmi/rmixl_pcix.c rmixl_pcix
+
# On-chip USB interface
define rmixl_usbi { [addr=-1], [size=-1], [intr=-1] }
device rmixl_usbi: rmixl_usbi
