From owner-svn-src-user@FreeBSD.ORG  Sat Feb 27 03:56:13 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 515AA106564A;
	Sat, 27 Feb 2010 03:56:13 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 417C28FC17;
	Sat, 27 Feb 2010 03:56:13 +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 o1R3uDhH044897;
	Sat, 27 Feb 2010 03:56:13 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1R3uDHe044895;
	Sat, 27 Feb 2010 03:56:13 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201002270356.o1R3uDHe044895@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 27 Feb 2010 03:56:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204394 - user/jmallett/octeon/sys/mips/conf
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Feb 2010 03:56:13 -0000

Author: jmallett
Date: Sat Feb 27 03:56:12 2010
New Revision: 204394
URL: http://svn.freebsd.org/changeset/base/204394

Log:
  o) Correct the ISA and -march values for Octeon -- it's not MIPS32.
  o) Switch to using the n32 ABI.

Modified:
  user/jmallett/octeon/sys/mips/conf/OCTEON1-32

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Sat Feb 27 03:55:08 2010	(r204393)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Sat Feb 27 03:56:12 2010	(r204394)
@@ -24,16 +24,18 @@ ident		OCTEON1
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 makeoptions     TARGET_BIG_ENDIAN=defined
-makeoptions     LDSCRIPT_NAME=ldscript.mips.octeon1.32
+makeoptions	TARGET_N32=defined
+makeoptions     LDSCRIPT_NAME=ldscript.mips.octeon1.n32
 
-makeoptions	KERNLOADADDR=0x81000000
+makeoptions	KERNLOADADDR=0xffffffff81000000
 include		"../cavium/std.octeon1"
 
 hints		"OCTEON1.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
-options 	ISA_MIPS32
+options 	ISA_MIPS64
+makeoptions	ARCH_FLAGS="-march=mips64 -mabi=n32"
 
 options		DDB
 options		KDB