From owner-svn-src-head@FreeBSD.ORG  Tue Mar 13 06:22:50 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 30B6D1065670;
	Tue, 13 Mar 2012 06:22:50 +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 1BC328FC12;
	Tue, 13 Mar 2012 06:22:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2D6Mnrq019688;
	Tue, 13 Mar 2012 06:22:49 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2D6Mn7U019685;
	Tue, 13 Mar 2012 06:22:49 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203130622.q2D6Mn7U019685@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 13 Mar 2012 06:22:49 +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: r232913 - in head/sys: conf mips/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Mar 2012 06:22:50 -0000

Author: jmallett
Date: Tue Mar 13 06:22:49 2012
New Revision: 232913
URL: http://svn.freebsd.org/changeset/base/232913

Log:
  Don't build kernel.tramp on Octeon.  Probably building it should be opt-in
  not opt-out, but I don't know enough about which ports need it to get the
  defaults right.

Modified:
  head/sys/conf/Makefile.mips
  head/sys/mips/conf/OCTEON1

Modified: head/sys/conf/Makefile.mips
==============================================================================
--- head/sys/conf/Makefile.mips	Tue Mar 13 06:15:20 2012	(r232912)
+++ head/sys/conf/Makefile.mips	Tue Mar 13 06:22:49 2012	(r232913)
@@ -63,6 +63,7 @@ TRAMP_ELFSIZE=32
 # XXX hardcoded kernel entry point
 ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
 
+.if !defined(WITHOUT_KERNEL_TRAMPOLINE)
 KERNEL_EXTRA=trampoline
 trampoline: ${KERNEL_KO}.tramp.bin
 ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \
@@ -78,6 +79,7 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/
 		-o ${KERNEL_KO}.tramp.elf
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.elf \
 		${KERNEL_KO}.tramp.bin
+.endif
 
 %BEFORE_DEPEND
 

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Tue Mar 13 06:15:20 2012	(r232912)
+++ head/sys/mips/conf/OCTEON1	Tue Mar 13 06:22:49 2012	(r232913)
@@ -27,6 +27,9 @@ makeoptions	LDSCRIPT_NAME=ldscript.mips.
 makeoptions	MODULES_OVERRIDE=""
 makeoptions	KERNLOADADDR=0xffffffff80100000
 
+# We don't need to build a trampolined version of the kernel.
+makeoptions	WITHOUT_KERNEL_TRAMPOLINE=1
+
 include		"../cavium/std.octeon1"
 
 hints		"OCTEON1.hints"		#Default places to look for devices.