From 1f656fbfdb79ab37bc3ce1f955edbf566de236fa Mon Sep 17 00:00:00 2001 From: jchandra Date: Thu, 20 Jan 2011 12:45:29 +0000 Subject: Move 'cpu CPU_RMI' to std.xlr, this is common for all XLR cpus. --- sys/mips/conf/XLR | 5 +---- sys/mips/conf/XLR64 | 5 +---- sys/mips/conf/XLRN32 | 4 +--- sys/mips/rmi/std.xlr | 4 +--- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sys/mips/conf/XLR b/sys/mips/conf/XLR index 9e0970e..3eea1c5 100644 --- a/sys/mips/conf/XLR +++ b/sys/mips/conf/XLR @@ -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 diff --git a/sys/mips/conf/XLR64 b/sys/mips/conf/XLR64 index 2854d65..b4a84dc 100644 --- a/sys/mips/conf/XLR64 +++ b/sys/mips/conf/XLR64 @@ -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 diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32 index 17fddce..21d3069 100644 --- a/sys/mips/conf/XLRN32 +++ b/sys/mips/conf/XLRN32 @@ -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 diff --git a/sys/mips/rmi/std.xlr b/sys/mips/rmi/std.xlr index 0252b95..6abfad2 100644 --- a/sys/mips/rmi/std.xlr +++ b/sys/mips/rmi/std.xlr @@ -1,7 +1,5 @@ # $FreeBSD$ files "../rmi/files.xlr" -# -# XXXMIPS: It's a stub, isn't it? -# +cpu CPU_RMI option NOFPU -- cgit v1.1