svn commit: r273287 - head/sys/conf

[Andrew Turner]

Author: andrew
Date: Sun Oct 19 20:56:05 2014
New Revision: 273287
URL: https://svnweb.freebsd.org/changeset/base/273287

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

Modified:
  head/sys/conf/Makefile.arm

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Sun Oct 19 20:54:04 2014	(r273286)
+++ head/sys/conf/Makefile.arm	Sun Oct 19 20:56:05 2014	(r273287)
@@ -77,6 +77,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
@@ -121,6 +122,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
 
 %BEFORE_DEPEND