diff options
| -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. |
