CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2012-01-19 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Jan 19 17:37:15 UTC 2012

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl

Log Message:
Cleanup/update attachments.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 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/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.18 src/sys/arch/mips/conf/files.rmixl:1.1.2.19
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.18	Wed Jan  4 16:17:53 2012
+++ src/sys/arch/mips/conf/files.rmixl	Thu Jan 19 17:37:15 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: files.rmixl,v 1.1.2.18 2012/01/04 16:17:53 matt Exp $
+#	$NetBSD: files.rmixl,v 1.1.2.19 2012/01/19 17:37:15 matt Exp $
 #
 # Configuration info for RMI XLP, XLR, XLS
 #
@@ -113,58 +113,58 @@ file	arch/mips/rmi/rmixl_sdio.c		xlsdio
 file	arch/mips/rmi/rmixl_sdhc.c		sdhc_xlsdio
 
 # XL Network Acceleration Engine
-device	xlnae { [port=-1] }
+device	xlnae { [complex=-1], [lane=-1], [kind=-1], [phy=-1] }
 attach	xlnae at obio with xlnae_obio
 attach	xlnae at pci with xlnae_pci
 device	nae: ether, ifnet, arp, mii
-attach	nae at xlnae
+attach	nae at xlnae with nae_gmac
 file	arch/mips/rmi/rmixl_xlnae_obio.c	xlnae_obio
 file	arch/mips/rmi/rmixl_xlnae_pci.c		xlnae_pci
 file	arch/mips/rmi/rmixl_xlnae.c		xlnae
-file	arch/mips/rmi/rmixl_nae.c		nae
+file	arch/mips/rmi/rmixl_nae.c		nae_gmac
 
 # XL Fast Messaging Network
 device	xlfmn
 attach	xlfmn at obio with xlfmn_obio
 attach	xlfmn at pci with xlfmn_pci
-file	arch/mips/rmi/rmixl_xlfmn_obio.c	xlfmn_obio
-file	arch/mips/rmi/rmixl_xlfmn_pci.c		xlfmn_pci
+file	arch/mips/rmi/rmixl_fmn_obio.c		xlfmn_obio
+file	arch/mips/rmi/rmixl_fmn_pci.c		xlfmn_pci
 
 # XL Packet Ordering Engine
 device	xlpoe
 attach	xlpoe at pci with xlpoe_pci
-file	arch/mips/rmi/rmixl_xlpoe_pci.c		xlpoe_pci
+file	arch/mips/rmi/rmixl_poe_pci.c		xlpoe_pci
 
 # XL Compression/Decompression Engine
 device	xlcde
 attach	xlcde at obio with xlcde_obio
 attach	xlcde at pci with xlcde_pci
-file	arch/mips/rmi/rmixl_xlcde_obio.c	xlcde_obio
-file	arch/mips/rmi/rmixl_xlcde_pci.c		xlcde_pci
+file	arch/mips/rmi/rmixl_cde_obio.c		xlcde_obio
+file	arch/mips/rmi/rmixl_cde_pci.c		xlcde_pci
 
 # XL Security Acceleration Engine (AES/etc.)
 device	xlsae
 attach	xlsae at obio with xlsae_obio
 attach	xlsae at pci with xlsae_pci
-file	arch/mips/rmi/rmixl_xlsae_obio.c	xlsae_obio
-file	arch/mips/rmi/rmixl_xlsae_pci.c		xlsae_pci
+file	arch/mips/rmi/rmixl_sae_obio.c		xlsae_obio
+file	arch/mips/rmi/rmixl_sae_pci.c		xlsae_pci
 
 # XL Public Key Engine (RSA/ECC)
 device	xlpke
 attach	xlpke at pci with xlpke_pci
-file	arch/mips/rmi/rmixl_xlpke_pci.c		xlpke_pci
+file	arch/mips/rmi/rmixl_pke_pci.c		xlpke_pci
 
 # XL Regular eXpression Engine
 device	xlrxe
 attach	xlrxe at pci with xlrxe_pci
-file	arch/mips/rmi/rmixl_xlrxe_pci.c		xlrxe_pci
+file	arch/mips/rmi/rmixl_rxe_pci.c		xlrxe_pci
 
 # XL Serial Rapid IO controller
 device	xlsrio
 attach	xlsrio at obio with xlsrio_obio
 attach	xlsrio at pci with xlsrio_pci
-file	arch/mips/rmi/rmixl_xlsrio_obio.c	xlsrio_obio
-file	arch/mips/rmi/rmixl_xlsrio_pci.c	xlsrio_pci
+file	arch/mips/rmi/rmixl_srio_obio.c		xlsrio_obio
+file	arch/mips/rmi/rmixl_srio_pci.c		xlsrio_pci
 
 # XL I2C controller
 device	xli2c: i2cbus



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2011-12-26 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Tue Dec 27 06:55:38 UTC 2011

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.mips

Log Message:
Add core_r4k_pcache*.S files.


To generate a diff of this commit:
cvs rdiff -u -r1.58.24.18 -r1.58.24.19 src/sys/arch/mips/conf/files.mips

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/mips/conf/files.mips
diff -u src/sys/arch/mips/conf/files.mips:1.58.24.18 src/sys/arch/mips/conf/files.mips:1.58.24.19
--- src/sys/arch/mips/conf/files.mips:1.58.24.18	Fri Dec 23 22:31:30 2011
+++ src/sys/arch/mips/conf/files.mips	Tue Dec 27 06:55:38 2011
@@ -71,6 +71,8 @@ file	arch/mips/mips/cache_r5k.c		mips3 |
 file	arch/mips/mips/cache_r5k_subr.S		mips3 | mips4
 file	arch/mips/mips/cache_r10k.c	(mips3|mips4)  enable_mips4_cache_r10k
 file	arch/mips/mips/cache_mipsNN.c		mips32|mips32r2|mips64|mips64r2|mips64_rmixl|mips64r2_rmixl
+file	arch/mips/mips/cache_r4k_pcache16.S	mips32|mips32r2|mips64|mips64r2|mips64_rmixl|mips64r2_rmixl
+file	arch/mips/mips/cache_r4k_pcache32.S	mips32|mips32r2|mips64|mips64r2|mips64_rmixl|mips64r2_rmixl
 
 file	arch/mips/mips/mips_fputrap.c		!nofpu | fpemul
 file	arch/mips/mips/mips_emul.c



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2011-02-04 Thread Cliff Neighbors
Module Name:src
Committed By:   cliff
Date:   Sat Feb  5 06:01:23 UTC 2011

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.mips

Log Message:
- define config options flag MIPS_DDB_WATCH, enables COP0 watchpoint support in 
ddb


To generate a diff of this commit:
cvs rdiff -u -r1.58.24.12 -r1.58.24.13 src/sys/arch/mips/conf/files.mips

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/mips/conf/files.mips
diff -u src/sys/arch/mips/conf/files.mips:1.58.24.12 src/sys/arch/mips/conf/files.mips:1.58.24.13
--- src/sys/arch/mips/conf/files.mips:1.58.24.12	Wed Dec 29 00:40:40 2010
+++ src/sys/arch/mips/conf/files.mips	Sat Feb  5 06:01:23 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.mips,v 1.58.24.12 2010/12/29 00:40:40 matt Exp $
+#	$NetBSD: files.mips,v 1.58.24.13 2011/02/05 06:01:23 cliff Exp $
 #
 
 defflag	opt_cputype.h		NOFPU FPEMUL
@@ -17,6 +17,7 @@
 defflag opt_mips3_wired.h		ENABLE_MIPS3_WIRED_MAP
 
 defflag	opt_ddb.h		DDB_TRACE
+defflag	opt_ddb.h		MIPS_DDB_WATCH
 
 file	arch/mips/mips/locore_mips1.S		mips1
 file	arch/mips/mips/locore_mips3.S		mips3 | mips4 | mips32 | mips64



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2010-04-12 Thread Cliff Neighbors
Module Name:src
Committed By:   cliff
Date:   Mon Apr 12 22:00:51 UTC 2010

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl

Log Message:
- rmixl_pcix and rmixl_pcie get 'needs-flag'


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 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/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.11 src/sys/arch/mips/conf/files.rmixl:1.1.2.12
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.11	Wed Apr  7 19:31:37 2010
+++ src/sys/arch/mips/conf/files.rmixl	Mon Apr 12 22:00:51 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files.rmixl,v 1.1.2.11 2010/04/07 19:31:37 cliff Exp $
+#	$NetBSD: files.rmixl,v 1.1.2.12 2010/04/12 22:00:51 cliff Exp $
 #
 # Configuration info for RMI XLP, XLR, XLS
 #
@@ -44,12 +44,12 @@
 # PCIe
 device  rmixl_pcie: pcibus
 attach  rmixl_pcie at obio
-filearch/mips/rmi/rmixl_pcie.c		rmixl_pcie
+filearch/mips/rmi/rmixl_pcie.c		rmixl_pcie	needs-flag
 
 # PCI-X
 device  rmixl_pcix: pcibus
 attach  rmixl_pcix at obio
-filearch/mips/rmi/rmixl_pcix.c		rmixl_pcix
+filearch/mips/rmi/rmixl_pcix.c		rmixl_pcix	needs-flag
 
 # On-chip USB interface
 define rmixl_usbi { [addr=-1], [size=-1], [intr=-1] }



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2010-03-21 Thread Cliff Neighbors
Module Name:src
Committed By:   cliff
Date:   Sun Mar 21 21:21:41 UTC 2010

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl

Log Message:
- add files rmixl_spl.S, rmixl_fmn.c
- add 'tmsk' locator to obio, allows specifying a thread (vCPU) mask
for interrupt routing; default is -1 which means route to any


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 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/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.9 src/sys/arch/mips/conf/files.rmixl:1.1.2.10
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.9	Wed Jan 20 20:48:12 2010
+++ src/sys/arch/mips/conf/files.rmixl	Sun Mar 21 21:21:41 2010
@@ -1,10 +1,12 @@
-#	$NetBSD: files.rmixl,v 1.1.2.9 2010/01/20 20:48:12 matt Exp $
+#	$NetBSD: files.rmixl,v 1.1.2.10 2010/03/21 21:21:41 cliff Exp $
 #
 # Configuration info for RMI XLP, XLR, XLS
 #
 
+file	arch/mips/rmi/rmixl_spl.S
 file	arch/mips/rmi/rmixl_intr.c
 file	arch/mips/rmi/rmixl_subr.S
+file	arch/mips/rmi/rmixl_fmn.c
 
 
 # node is parent of one or more core
@@ -23,7 +25,7 @@
 file	arch/mips/rmi/rmixl_cpu.c		cpu_rmixl
 
 # OBIO: offsets are from System Bridge Controller base
-define obio { [addr=-1], [size=0], [intr=-1], [mult=1] }
+define obio { [addr=-1], [size=0], [intr=-1], [tmsk=-1], [mult=1] }
 device	obio: obio
 attach	obio at cpunode with obio_rmixl
 file	arch/mips/rmi/rmixl_obio.c		obio_rmixl



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2010-02-14 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sun Feb 14 21:50:38 UTC 2010

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: Makefile.mips

Log Message:
We use ntrad* and so make objcopy use them too.


To generate a diff of this commit:
cvs rdiff -u -r1.50.24.5 -r1.50.24.6 src/sys/arch/mips/conf/Makefile.mips

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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.50.24.5 src/sys/arch/mips/conf/Makefile.mips:1.50.24.6
--- src/sys/arch/mips/conf/Makefile.mips:1.50.24.5	Sat Jan 30 23:49:31 2010
+++ src/sys/arch/mips/conf/Makefile.mips	Sun Feb 14 21:50:38 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mips,v 1.50.24.5 2010/01/30 23:49:31 matt Exp $
+#	$NetBSD: Makefile.mips,v 1.50.24.6 2010/02/14 21:50:38 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -56,15 +56,15 @@
 LDFLAGS+=	-m elf64btsmip
 LINKFORMAT+=	-m elf64btsmip
 SYSTEM_LD_TAIL_EXTRA+= \
-		;echo ${OBJCOPY} -O elf32-nbigmips $@ $...@.elf32; \
-		${OBJCOPY} -O elf32-nbigmips $@ $...@.elf32
+		;echo ${OBJCOPY} -O elf32-ntradbigmips $@ $...@.elf32; \
+		${OBJCOPY} -O elf32-ntradbigmips $@ $...@.elf32
 .endif
 .if ${MACHINE_ARCH} == mips64el
 LDFLAGS+=	-m elf64ltsmip
 LINKFORMAT+=	-m elf64ltsmip
 SYSTEM_LD_TAIL_EXTRA+= \
-	;echo ${OBJCOPY} -O elf32-nlittlemips $@ $...@.elf32; \
-	${OBJCOPY} -O elf32-nlittlemips $@ $...@.elf32
+	;echo ${OBJCOPY} -O elf32-ntradlittlemips $@ $...@.elf32; \
+	${OBJCOPY} -O elf32-ntradlittlemips $@ $...@.elf32
 .endif
 .endif # LP64=yes
 AFLAGS+=	-mno-abicalls -x assembler-with-cpp -traditional-cpp ${AOPTS}



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2010-01-21 Thread Erik Berls
Module Name:src
Committed By:   cyber
Date:   Thu Jan 21 08:39:55 UTC 2010

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.sibyte

Log Message:
Remove sbpcihb, unused


To generate a diff of this commit:
cvs rdiff -u -r1.5.124.2 -r1.5.124.3 src/sys/arch/mips/conf/files.sibyte

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/mips/conf/files.sibyte
diff -u src/sys/arch/mips/conf/files.sibyte:1.5.124.2 src/sys/arch/mips/conf/files.sibyte:1.5.124.3
--- src/sys/arch/mips/conf/files.sibyte:1.5.124.2	Thu Jan 21 07:46:01 2010
+++ src/sys/arch/mips/conf/files.sibyte	Thu Jan 21 08:39:54 2010
@@ -25,10 +25,6 @@
 file	arch/mips/sibyte/pci/sbbrz_bus_io.c	sbbrz
 file	arch/mips/sibyte/pci/sbbrz_bus_mem.c	sbbrz
 
-# Instantiated SB-1250 PCI Host bridge
-device	sbpcihb
-attach	sbpcihb at pci
-file	arch/mips/sibyte/pci/sbpcihb.c		sbpcihb
 
 # sbscd children
 



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2010-01-16 Thread Cliff Neighbors
Module Name:src
Committed By:   cliff
Date:   Sat Jan 16 23:50:05 UTC 2010

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl

Log Message:
- cpucore and cpu config info moved here from to arch/evbmips/conf/files.rmixl
- obio now attaches to cpunode instead of mainbus


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 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/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.7 src/sys/arch/mips/conf/files.rmixl:1.1.2.8
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.7	Mon Dec 14 07:23:07 2009
+++ src/sys/arch/mips/conf/files.rmixl	Sat Jan 16 23:50:04 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files.rmixl,v 1.1.2.7 2009/12/14 07:23:07 cliff Exp $
+#	$NetBSD: files.rmixl,v 1.1.2.8 2010/01/16 23:50:04 cliff Exp $
 #
 # Configuration info for RMI XLP, XLR, XLS
 #
@@ -6,10 +6,26 @@
 file	arch/mips/rmi/rmixl_intr.c
 file	arch/mips/rmi/rmixl_subr.S
 
+
+# node is parent of one or more core
+device	cpunode { [ core = -1] }
+attach	cpunode at mainbus
+file	arch/mips/rmi/rmixl_cpunode.c		cpunode
+
+# core is parent of one or more cpu
+device	cpucore { [ thread = -1] }
+attach	cpucore at cpunode
+file	arch/mips/rmi/rmixl_cpucore.c		cpucore
+
+# each cpu is a RMI 'thread' or 'vCPU'
+device	cpu
+attach	cpu at cpucore
+file	arch/mips/rmi/rmixl_cpu.c		cpu
+
 # OBIO: offsets are from System Bridge Controller base
 define obio { [addr=-1], [size=0], [intr=-1], [mult=1] }
 device	obio: obio
-attach	obio at mainbus
+attach	obio at cpunode
 file	arch/mips/rmi/rmixl_obio.c		obio needs-count
 filearch/mips/rmi/rmixl_obio_eb_space.c	obio
 filearch/mips/rmi/rmixl_obio_el_space.c	obio



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2009-12-13 Thread Cliff Neighbors
Module Name:src
Committed By:   cliff
Date:   Mon Dec 14 07:23:08 UTC 2009

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl

Log Message:
- replace single bus space with two (big  little endian) bus spaces for obio
- configure RMI XLx USB Interface driver rmixl_usbi
- attach ohci at rmixl_usbi
- attach ehci at rmixl_usbi


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 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/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.6 src/sys/arch/mips/conf/files.rmixl:1.1.2.7
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.6	Sun Nov 15 22:58:15 2009
+++ src/sys/arch/mips/conf/files.rmixl	Mon Dec 14 07:23:07 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: files.rmixl,v 1.1.2.6 2009/11/15 22:58:15 cliff Exp $
+#	$NetBSD: files.rmixl,v 1.1.2.7 2009/12/14 07:23:07 cliff Exp $
 #
 # Configuration info for RMI XLP, XLR, XLS
 #
@@ -11,7 +11,8 @@
 device	obio: obio
 attach	obio at mainbus
 file	arch/mips/rmi/rmixl_obio.c		obio needs-count
-filearch/mips/rmi/rmixl_obio_space.c	obio
+filearch/mips/rmi/rmixl_obio_eb_space.c	obio
+filearch/mips/rmi/rmixl_obio_el_space.c	obio
 filearch/mips/rmi/rmixl_pcie_cfg_space.c	pci
 filearch/mips/rmi/rmixl_pcie_ecfg_space.c	pci
 filearch/mips/rmi/rmixl_pcie_io_space.c	pci
@@ -27,3 +28,17 @@
 attach  rmixl_pcie at obio
 filearch/mips/rmi/rmixl_pcie.c		rmixl_pcie
 
+# On-chip USB interface
+define rmixl_usbi { [addr=-1], [size=-1], [intr=-1] }
+device	rmixl_usbi: rmixl_usbi
+attach	rmixl_usbi at obio
+file	arch/mips/rmi/rmixl_usbi.c		rmixl_usbi
+
+# On-chip OHCI USB controller
+attach	ohci at rmixl_usbi with rmixl_ohci
+file	arch/mips/rmi/rmixl_ohci.c		ohci
+
+# On-chip EHCI USB controller
+attach	ehci at rmixl_usbi with rmixl_ehci
+file	arch/mips/rmi/rmixl_ehci.c		ehci
+



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2009-11-14 Thread Cliff Neighbors
Module Name:src
Committed By:   cliff
Date:   Sat Nov 14 21:59:15 UTC 2009

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl

Log Message:
- rmixls_subr.S is replaced by rmixl_subr.S


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 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/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.4 src/sys/arch/mips/conf/files.rmixl:1.1.2.5
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.4	Mon Nov  9 09:56:06 2009
+++ src/sys/arch/mips/conf/files.rmixl	Sat Nov 14 21:59:15 2009
@@ -1,10 +1,10 @@
-#	$NetBSD: files.rmixl,v 1.1.2.4 2009/11/09 09:56:06 cliff Exp $
+#	$NetBSD: files.rmixl,v 1.1.2.5 2009/11/14 21:59:15 cliff Exp $
 #
 # Configuration info for RMI XLP, XLR, XLS
 #
 
 file	arch/mips/rmi/rmixl_intr.c
-file	arch/mips/rmi/rmixls_subr.S
+file	arch/mips/rmi/rmixl_subr.S
 
 # OBIO: offsets are from System Bridge Controller base
 define obio { [addr=-1], [size=0], [intr=-1], [mult=1] }



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2009-09-22 Thread Cliff Neighbors
Module Name:src
Committed By:   cliff
Date:   Tue Sep 22 06:58:20 UTC 2009

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl

Log Message:
add CONSFREQ to opt_com.h options


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 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/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.2 src/sys/arch/mips/conf/files.rmixl:1.1.2.3
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.2	Tue Sep 15 02:32:01 2009
+++ src/sys/arch/mips/conf/files.rmixl	Tue Sep 22 06:58:20 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: files.rmixl,v 1.1.2.2 2009/09/15 02:32:01 cliff Exp $
+#	$NetBSD: files.rmixl,v 1.1.2.3 2009/09/22 06:58:20 cliff Exp $
 #
 # Configuration info for RMI XLP, XLR, XLS
 #
@@ -16,5 +16,5 @@
 # NS16550 compatible serial ports
 attach com at obio with rmixl_com
 file	arch/mips/rmi/rmixl_com.c		rmixl_com
-defparam opt_com.hCONSADDR CONSPEED CONMODE
+defparam opt_com.hCONSADDR CONSFREQ CONSPEED CONMODE
 



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2009-09-12 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep 12 17:37:29 UTC 2009

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.mips

Log Message:
Add COMPAT_NETBSD32 support


To generate a diff of this commit:
cvs rdiff -u -r1.58.24.1 -r1.58.24.2 src/sys/arch/mips/conf/files.mips

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/mips/conf/files.mips
diff -u src/sys/arch/mips/conf/files.mips:1.58.24.1 src/sys/arch/mips/conf/files.mips:1.58.24.2
--- src/sys/arch/mips/conf/files.mips:1.58.24.1	Sun Aug 23 04:38:34 2009
+++ src/sys/arch/mips/conf/files.mips	Sat Sep 12 17:37:29 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: files.mips,v 1.58.24.1 2009/08/23 04:38:34 uebayasi Exp $
+#	$NetBSD: files.mips,v 1.58.24.2 2009/09/12 17:37:29 matt Exp $
 #
 
 defflag	opt_cputype.h		NOFPU
@@ -61,6 +61,10 @@
 
 file	arch/mips/mips/procfs_machdep.c		procfs
 
+# Binary compatibility with 32bit NetBSD (COMPAT_NETBSD32)
+file	arch/mips/mips/netbsd32_machdep.c	compat_netbsd32
+include compat/netbsd32/files.netbsd32
+
 # Binary compatibility with previous NetBSD releases (COMPAT_XX)
 file	arch/mips/mips/compat_13_machdep.c	compat_13 | compat_ultrix
 file	arch/mips/mips/compat_16_machdep.c	compat_16 | compat_ultrix



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2009-09-12 Thread Cliff Neighbors
Module Name:src
Committed By:   cliff
Date:   Sun Sep 13 03:28:51 UTC 2009

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.mips

Log Message:
add MIPS64_XLP MIPS64_XLR MIPS64_XLS to list of flags in opt_cputype.h


To generate a diff of this commit:
cvs rdiff -u -r1.58.24.2 -r1.58.24.3 src/sys/arch/mips/conf/files.mips

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/mips/conf/files.mips
diff -u src/sys/arch/mips/conf/files.mips:1.58.24.2 src/sys/arch/mips/conf/files.mips:1.58.24.3
--- src/sys/arch/mips/conf/files.mips:1.58.24.2	Sat Sep 12 17:37:29 2009
+++ src/sys/arch/mips/conf/files.mips	Sun Sep 13 03:28:51 2009
@@ -1,8 +1,9 @@
-#	$NetBSD: files.mips,v 1.58.24.2 2009/09/12 17:37:29 matt Exp $
+#	$NetBSD: files.mips,v 1.58.24.3 2009/09/13 03:28:51 cliff Exp $
 #
 
 defflag	opt_cputype.h		NOFPU
 MIPS64_SB1
+MIPS64_XLP MIPS64_XLR MIPS64_XLS
 	# and the rest...
 	# MIPS1	MIPS2 MIPS3 MIPS4 MIPS5
 	# MIPS32 MIPS64



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2009-08-21 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Aug 21 17:34:09 UTC 2009

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: Makefile.mips

Log Message:
Use LINKFORMAT, not LINKFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.50.24.1 -r1.50.24.2 src/sys/arch/mips/conf/Makefile.mips

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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.50.24.1 src/sys/arch/mips/conf/Makefile.mips:1.50.24.2
--- src/sys/arch/mips/conf/Makefile.mips:1.50.24.1	Thu Aug 20 07:32:11 2009
+++ src/sys/arch/mips/conf/Makefile.mips	Fri Aug 21 17:34:09 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mips,v 1.50.24.1 2009/08/20 07:32:11 matt Exp $
+#	$NetBSD: Makefile.mips,v 1.50.24.2 2009/08/21 17:34:09 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -54,11 +54,11 @@
 .endif
 .if ${MACHINE_ARCH} == mips64eb
 LDFLAGS+=	-m elf64btsmip
-LINKFLAGS+=	-m elf64btsmip
+LINKFORMAT+=	-m elf64btsmip
 .endif
 .if ${MACHINE_ARCH} == mips64el
 LDFLAGS+=	-m elf64ltsmip
-LINKFLAGS+=	-m elf64ltsmip
+LINKFORMAT+=	-m elf64ltsmip
 .endif
 .endif # LP64=yes
 AFLAGS+=	-mno-abicalls -x assembler-with-cpp -traditional-cpp ${AOPTS}



CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

2009-08-20 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Aug 20 07:32:11 UTC 2009

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: Makefile.mips

Log Message:
Add support for building N64 kernels.  This is done by adding
makeoptions LP64=yes

to your config file.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.50.24.1 src/sys/arch/mips/conf/Makefile.mips

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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.50 src/sys/arch/mips/conf/Makefile.mips:1.50.24.1
--- src/sys/arch/mips/conf/Makefile.mips:1.50	Mon Feb 18 15:21:04 2008
+++ src/sys/arch/mips/conf/Makefile.mips	Thu Aug 20 07:32:11 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mips,v 1.50 2008/02/18 15:21:04 tsutsui Exp $
+#	$NetBSD: Makefile.mips,v 1.50.24.1 2009/08/20 07:32:11 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -47,9 +47,20 @@
 DEFGP?=		-G 0
 GP?=		${DEFGP}
 CFLAGS+=	${GP} -mno-abicalls -msoft-float -ffixed-23
+.if defined(LP64)  ${LP64} == yes
 .if ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
-CFLAGS+=	-msym32
+CFLAGS+=	-msym32 -mabi=64
+AFLAGS+=	-msym32 -mabi=64
 .endif
+.if ${MACHINE_ARCH} == mips64eb
+LDFLAGS+=	-m elf64btsmip
+LINKFLAGS+=	-m elf64btsmip
+.endif
+.if ${MACHINE_ARCH} == mips64el
+LDFLAGS+=	-m elf64ltsmip
+LINKFLAGS+=	-m elf64ltsmip
+.endif
+.endif # LP64=yes
 AFLAGS+=	-mno-abicalls -x assembler-with-cpp -traditional-cpp ${AOPTS}
 
 ##