From owner-svn-src-all@FreeBSD.ORG Thu Jan 20 08:15:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FE501065672; Thu, 20 Jan 2011 08:15:12 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E4598FC13; Thu, 20 Jan 2011 08:15:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0K8FCYu005785; Thu, 20 Jan 2011 08:15:12 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0K8FCBu005780; Thu, 20 Jan 2011 08:15:12 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201101200815.p0K8FCBu005780@svn.freebsd.org> From: "Jayachandran C." Date: Thu, 20 Jan 2011 08:15:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217626 - in head/sys: conf mips/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jan 2011 08:15:12 -0000 Author: jchandra Date: Thu Jan 20 08:15:11 2011 New Revision: 217626 URL: http://svn.freebsd.org/changeset/base/217626 Log: ldscript and conf cleanup for MIPS - Remove sys/conf/ldscript.mips.64 and sys/conf/ldscript.mips.n32 and use ldscript.mips for all ABIs. The default OUTPUT_FORMAT of the toolchain is correct. - Remove LDSCRIPT_NAME entires from XLR n32 and n64 conf files. - Remove TARGET_BIG_ENDIAN from XLR conf files. - Fix machine entry in XLRN32 Deleted: head/sys/conf/ldscript.mips.64 head/sys/conf/ldscript.mips.n32 Modified: head/sys/mips/conf/MALTA64 head/sys/mips/conf/XLR head/sys/mips/conf/XLR64 head/sys/mips/conf/XLRN32 Modified: head/sys/mips/conf/MALTA64 ============================================================================== --- head/sys/mips/conf/MALTA64 Thu Jan 20 08:08:19 2011 (r217625) +++ head/sys/mips/conf/MALTA64 Thu Jan 20 08:15:11 2011 (r217626) @@ -22,7 +22,6 @@ ident MALTA machine mips mips64el # Malta supports both, so it isn't in std.malta makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" -makeoptions LDSCRIPT_NAME= ldscript.mips.mips64 options YAMON Modified: head/sys/mips/conf/XLR ============================================================================== --- head/sys/mips/conf/XLR Thu Jan 20 08:08:19 2011 (r217625) +++ head/sys/mips/conf/XLR Thu Jan 20 08:15:11 2011 (r217626) @@ -50,7 +50,6 @@ cpu CPU_RMI ident XLR makeoptions MODULES_OVERRIDE="" -makeoptions TARGET_BIG_ENDIAN # include "../rmi/std.xlr" @@ -58,6 +57,8 @@ include "../rmi/std.xlr" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols #profile 2 +makeoptions KERNLOADADDR=0x80100000 +options ISA_MIPS32 options SCHED_ULE # ULE scheduler #options VERBOSE_SYSINIT @@ -156,5 +157,3 @@ device at24co2n # EEPROM on XLR boa #device cryptodev #device crypto #device rmisec -options ISA_MIPS32 -makeoptions KERNLOADADDR=0x80100000 Modified: head/sys/mips/conf/XLR64 ============================================================================== --- head/sys/mips/conf/XLR64 Thu Jan 20 08:08:19 2011 (r217625) +++ head/sys/mips/conf/XLR64 Thu Jan 20 08:15:11 2011 (r217626) @@ -22,13 +22,12 @@ cpu CPU_RMI ident XLR64 makeoptions MODULES_OVERRIDE="" -makeoptions TARGET_BIG_ENDIAN - include "../rmi/std.xlr" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" -makeoptions LDSCRIPT_NAME=ldscript.mips.64 +makeoptions KERNLOADADDR=0xffffffff80100000 +options ISA_MIPS64 #profile 2 @@ -129,5 +128,3 @@ device umass # Disks/ #device cryptodev #device crypto #device rmisec -options ISA_MIPS64 -makeoptions KERNLOADADDR=0xffffffff80100000 Modified: head/sys/mips/conf/XLRN32 ============================================================================== --- head/sys/mips/conf/XLRN32 Thu Jan 20 08:08:19 2011 (r217625) +++ head/sys/mips/conf/XLRN32 Thu Jan 20 08:15:11 2011 (r217626) @@ -17,18 +17,17 @@ # # $FreeBSD$ -machine mips mipseb +machine mips mipsn32eb cpu CPU_RMI ident XLRN32 makeoptions MODULES_OVERRIDE="" -makeoptions TARGET_BIG_ENDIAN - include "../rmi/std.xlr" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32" -makeoptions LDSCRIPT_NAME=ldscript.mips.n32 +makeoptions KERNLOADADDR=0x80100000 +options ISA_MIPS64 #profile 2 @@ -129,5 +128,3 @@ device umass # Disks/ #device cryptodev #device crypto #device rmisec -options ISA_MIPS64 -makeoptions KERNLOADADDR=0x80100000