Date: Tue, 27 Feb 2018 17:35:29 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330077 - in head: share/mk stand stand/efi Message-ID: <201802271735.w1RHZT4q002319@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Feb 27 17:35:29 2018 New Revision: 330077 URL: https://svnweb.freebsd.org/changeset/base/330077 Log: Move EFI up to common makefile. There's no need for all these .if's based on architecture. Sponsored by: Netflix Modified: head/share/mk/src.opts.mk head/stand/Makefile head/stand/Makefile.amd64 head/stand/Makefile.arm head/stand/Makefile.arm64 head/stand/Makefile.i386 head/stand/efi/Makefile Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Tue Feb 27 17:12:33 2018 (r330076) +++ head/share/mk/src.opts.mk Tue Feb 27 17:35:29 2018 (r330077) @@ -125,6 +125,7 @@ __DEFAULT_YES_OPTIONS = \ LPR \ LS_COLORS \ LZMA_SUPPORT \ + LOADER_EFI \ LOADER_GELI \ MAIL \ MAILWRAPPER \ @@ -285,8 +286,9 @@ BROKEN_OPTIONS+=LIBSOFT .if ${__T:Mmips*} BROKEN_OPTIONS+=SSP .endif +# EFI doesn't exist on mips, powerpc, sparc or riscv. .if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} || ${__T:Mriscv*} -BROKEN_OPTIONS+=EFI +BROKEN_OPTIONS+=EFI LOADER_EFI .endif .if ${__T:Mmips64*} # profiling won't work on MIPS64 because there is only assembly for o32 Modified: head/stand/Makefile ============================================================================== --- head/stand/Makefile Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile Tue Feb 27 17:35:29 2018 (r330077) @@ -18,6 +18,10 @@ SUBDIR+= man .include <bsd.arch.inc.mk> +.if ${MK_EFI} != "no" && ${MK_LOADER_EFI} != "no" +SUBDIR+= efi +.endif + .if exists(${.CURDIR}/${MACHINE}/.) SUBDIR+= ${MACHINE} .endif Modified: head/stand/Makefile.amd64 ============================================================================== --- head/stand/Makefile.amd64 Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile.amd64 Tue Feb 27 17:35:29 2018 (r330077) @@ -11,7 +11,6 @@ SUBDIR+= ficl32 SUBDIR+= liblua32 .endif -SUBDIR+= efi SUBDIR+= userboot .if ${MK_LOADER_GELI} == "yes" Modified: head/stand/Makefile.arm ============================================================================== --- head/stand/Makefile.arm Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile.arm Tue Feb 27 17:35:29 2018 (r330077) @@ -7,4 +7,4 @@ SUBDIR+= fdt SUBDIR+= zfs .endif -SUBDIR+= efi uboot +SUBDIR+= uboot Modified: head/stand/Makefile.arm64 ============================================================================== --- head/stand/Makefile.arm64 Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile.arm64 Tue Feb 27 17:35:29 2018 (r330077) @@ -6,5 +6,3 @@ SUBDIR+= fdt .if ${MK_ZFS} != "no" SUBDIR+= zfs .endif - -SUBDIR+= efi Modified: head/stand/Makefile.i386 ============================================================================== --- head/stand/Makefile.i386 Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile.i386 Tue Feb 27 17:35:29 2018 (r330077) @@ -6,5 +6,3 @@ SUBDIR+= geli .if ${MK_ZFS} != "no" SUBDIR+= zfs .endif - -SUBDIR+= efi Modified: head/stand/efi/Makefile ============================================================================== --- head/stand/efi/Makefile Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/efi/Makefile Tue Feb 27 17:35:29 2018 (r330077) @@ -8,17 +8,11 @@ NO_OBJ=t # than 4.5 supports it. .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" .if ${MK_FDT} != "no" SUBDIR+= fdt .endif -.endif -.if ${MACHINE_CPUARCH} == "aarch64" || \ - ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" SUBDIR+= libefi loader boot1 -.endif .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802271735.w1RHZT4q002319>