Date: Tue, 13 Mar 2012 06:22:49 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r232913 - in head/sys: conf mips/conf Message-ID: <201203130622.q2D6Mn7U019685@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203130622.q2D6Mn7U019685>