svn commit: r273829 - stable/10/sys/conf

[Andrew Turner]

Author: andrew
Date: Wed Oct 29 16:38:13 2014
New Revision: 273829
URL: https://svnweb.freebsd.org/changeset/base/273829

Log:
  MFC r273287:
  
   Only build the ARM tranpoline when KERNPHYSADDR is defined as it is
   otherwise unneeded in armv6 kernels.

Modified:
  stable/10/sys/conf/Makefile.arm
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/Makefile.arm
==============================================================================
--- stable/10/sys/conf/Makefile.arm	Wed Oct 29 16:36:08 2014	(r273828)
+++ stable/10/sys/conf/Makefile.arm	Wed Oct 29 16:38:13 2014	(r273829)
@@ -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/$
 	    ${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}