diff options
| author | andrew <andrew@FreeBSD.org> | 2014-10-29 16:38:13 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2014-10-29 16:38:13 +0000 |
| commit | 1bb14d221924540e8fc6e1c343d49b3341800a30 (patch) | |
| tree | 5894dc68f060e0d8a61d419073d5eb06ee331b35 | |
| parent | ce556e32576b3ac1f093f651cb863dad68e1729a (diff) | |
| download | FreeBSD-src-1bb14d221924540e8fc6e1c343d49b3341800a30.zip FreeBSD-src-1bb14d221924540e8fc6e1c343d49b3341800a30.tar.gz | |
MFC r273287:
Only build the ARM tranpoline when KERNPHYSADDR is defined as it is
otherwise unneeded in armv6 kernels.
| -rw-r--r-- | sys/conf/Makefile.arm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index ce397ed..ce029f6 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -81,6 +81,7 @@ FILES_CPU_FUNC = \ $S/$M/$M/cpufunc_asm_pj4b.S $S/$M/$M/cpufunc_asm_armv6.S \ $S/$M/$M/cpufunc_asm_armv7.S +.if defined(KERNPHYSADDR) KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp @@ -125,6 +126,7 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c ${KERNEL_KO}.gz.tramp.bin rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \ inflate-tramp.o tmphack.S +.endif MKMODULESENV+= MACHINE=${MACHINE} |
