Date: Sun, 16 Apr 2017 07:43:29 +0000 (UTC) From: Michal Meloun <mmel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r317007 - stable/11/sys/conf Message-ID: <201704160743.v3G7hTN2089563@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmel Date: Sun Apr 16 07:43:29 2017 New Revision: 317007 URL: https://svnweb.freebsd.org/changeset/base/317007 Log: 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. Modified: stable/11/sys/conf/Makefile.arm Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/Makefile.arm ============================================================================== --- stable/11/sys/conf/Makefile.arm Sun Apr 16 07:41:30 2017 (r317006) +++ stable/11/sys/conf/Makefile.arm Sun Apr 16 07:43:29 2017 (r317007) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704160743.v3G7hTN2089563>