svn commit: r306703 - head/sys/conf

[Michal Meloun]

Author: mmel
Date: Wed Oct  5 12:17:43 2016
New Revision: 306703
URL: https://svnweb.freebsd.org/changeset/base/306703

Log:
  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.

Modified:
  head/sys/conf/Makefile.arm

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Wed Oct  5 04:40:48 2016	(r306702)
+++ head/sys/conf/Makefile.arm	Wed Oct  5 12:17:43 2016	(r306703)
@@ -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