svn commit: r217636 - in head/sys/mips: conf rmi

[Jayachandran C.]

Author: jchandra
Date: Thu Jan 20 12:45:29 2011
New Revision: 217636
URL: http://svn.freebsd.org/changeset/base/217636

Log:
  Move 'cpu CPU_RMI' to std.xlr, this is common for all XLR cpus.

Modified:
  head/sys/mips/conf/XLR
  head/sys/mips/conf/XLR64
  head/sys/mips/conf/XLRN32
  head/sys/mips/rmi/std.xlr

Modified: head/sys/mips/conf/XLR
==============================================================================
--- head/sys/mips/conf/XLR	Thu Jan 20 12:40:09 2011	(r217635)
+++ head/sys/mips/conf/XLR	Thu Jan 20 12:45:29 2011	(r217636)
@@ -46,13 +46,10 @@
 # $FreeBSD$
 
 machine 	mips mipseb
-cpu 		CPU_RMI
 ident 		XLR
-
-makeoptions	MODULES_OVERRIDE=""
-
 include		"../rmi/std.xlr"
 
+makeoptions	MODULES_OVERRIDE=""
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	KERNLOADADDR=0x80100000
 #profile		2

Modified: head/sys/mips/conf/XLR64
==============================================================================
--- head/sys/mips/conf/XLR64	Thu Jan 20 12:40:09 2011	(r217635)
+++ head/sys/mips/conf/XLR64	Thu Jan 20 12:45:29 2011	(r217636)
@@ -18,13 +18,10 @@
 # $FreeBSD$
 
 machine 	mips mips64eb
-cpu 		CPU_RMI
 ident 		XLR64
-
-makeoptions	MODULES_OVERRIDE=""
-
 include		"../rmi/std.xlr"
 
+makeoptions	MODULES_OVERRIDE=""
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
 makeoptions	KERNLOADADDR=0xffffffff80100000

Modified: head/sys/mips/conf/XLRN32
==============================================================================
--- head/sys/mips/conf/XLRN32	Thu Jan 20 12:40:09 2011	(r217635)
+++ head/sys/mips/conf/XLRN32	Thu Jan 20 12:45:29 2011	(r217636)
@@ -18,12 +18,10 @@
 # $FreeBSD$
 
 machine 	mips mipsn32eb
-cpu 		CPU_RMI
 ident 		XLRN32
-
-makeoptions	MODULES_OVERRIDE=""
 include		"../rmi/std.xlr"
 
+makeoptions	MODULES_OVERRIDE=""
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=n32"
 makeoptions	KERNLOADADDR=0x80100000

Modified: head/sys/mips/rmi/std.xlr
==============================================================================
--- head/sys/mips/rmi/std.xlr	Thu Jan 20 12:40:09 2011	(r217635)
+++ head/sys/mips/rmi/std.xlr	Thu Jan 20 12:45:29 2011	(r217636)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 files	"../rmi/files.xlr"
 
-#
-# XXXMIPS: It's a stub, isn't it?
-#
+cpu	CPU_RMI
 option	NOFPU