diff options
| author | mmel <mmel@FreeBSD.org> | 2017-04-16 07:43:29 +0000 |
|---|---|---|
| committer | mmel <mmel@FreeBSD.org> | 2017-04-16 07:43:29 +0000 |
| commit | af219d613e65f35aa1db4d19a701b3e172f1b4e3 (patch) | |
| tree | b03f8d757ae3782c1c2ae4d6d895cc9f726c1a45 | |
| parent | 92ef06e740d1067387434c033c577d17665c0fd5 (diff) | |
| download | FreeBSD-src-af219d613e65f35aa1db4d19a701b3e172f1b4e3.zip FreeBSD-src-af219d613e65f35aa1db4d19a701b3e172f1b4e3.tar.gz | |
MFC r306703:
ARM: Disconnect elf_trampoline.c from ARMv6 build. The trampoline code never
functioned properly for Cortex CPUs, and its functionality is already
provided by ubldr.
| -rw-r--r-- | sys/conf/Makefile.arm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index a7df55b..04a70ee 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -74,7 +74,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) +.if ${TARGET_ARCH} != "armv6" && defined(KERNPHYSADDR) KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp |
