From 50171807897f531c08b0c0cf41b16df853955682 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Sun, 19 Oct 2014 20:56:05 +0000 Subject: [PATCH] Only build the ARM tranpoline when KERNPHYSADDR is defined as it is otherwise unneeded in armv6 kernels. MFC after: 1 week --- sys/conf/Makefile.arm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 2727f815ebd9..e82505b011f9 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -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/$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 %BEFORE_DEPEND