diff options
| author | jmallett <jmallett@FreeBSD.org> | 2012-03-13 06:22:49 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2012-03-13 06:22:49 +0000 |
| commit | 99b3b3eed925c8cfdfcc91d4866480e55e62b38a (patch) | |
| tree | 5878d131c2b6669dd6bc48e6d924e38edd45c3d7 | |
| parent | d44d6b85dc06426120a4f7c7c6c55be5b0f7436a (diff) | |
| download | FreeBSD-src-99b3b3eed925c8cfdfcc91d4866480e55e62b38a.zip FreeBSD-src-99b3b3eed925c8cfdfcc91d4866480e55e62b38a.tar.gz | |
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.
| -rw-r--r-- | sys/conf/Makefile.mips | 2 | ||||
| -rw-r--r-- | sys/mips/conf/OCTEON1 | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips index 6928079..c50f9c2 100644 --- a/sys/conf/Makefile.mips +++ b/sys/conf/Makefile.mips @@ -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/$M/$M/elf_trampoline.c \ -o ${KERNEL_KO}.tramp.elf ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.elf \ ${KERNEL_KO}.tramp.bin +.endif %BEFORE_DEPEND diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1 index fe7d112..1425bc3 100644 --- a/sys/mips/conf/OCTEON1 +++ b/sys/mips/conf/OCTEON1 @@ -27,6 +27,9 @@ makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1 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. |
