From 9a078849430baf51c79d0586ee844b7f50bda1d0 Mon Sep 17 00:00:00 2001 From: kevans Date: Fri, 6 Apr 2018 19:47:07 +0000 Subject: MFC r330077, r330248 r330077: Move EFI up to common makefile. There's no need for all these .if's based on architecture. Sponsored by: Netflix r330248: Create LOADER_UBOOT, and LOADER_OFW. Move these options out of Makefile.${MACHINE_ARCH} and remove the now-empty files. Generate the *32 directories on the necessary architectures (well, currently only amd64) on the fly. Remove LOADER_EFI variable and co-locate it with EFI. --- share/mk/src.opts.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'share') diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0a018d2..b305571 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -131,6 +131,8 @@ __DEFAULT_YES_OPTIONS = \ LPR \ LS_COLORS \ LZMA_SUPPORT \ + LOADER_OFW \ + LOADER_UBOOT \ MAIL \ MAILWRAPPER \ MAKE \ @@ -276,9 +278,23 @@ BROKEN_OPTIONS+=LLDB .if ${__T} != "armv6" BROKEN_OPTIONS+=LIBSOFT .endif +# EFI doesn't exist on mips, powerpc, sparc or riscv. .if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} || ${__T:Mriscv*} BROKEN_OPTIONS+=EFI .endif +# GELI isn't supported on !x86 +.if ${__T} != "i386" && ${__T} != "amd64" +BROKEN_OPTIONS+=LOADER_GELI +.endif +# OFW is only for powerpc and sparc64, exclude others +.if ${__T:Mpowerpc*} == "" && ${__T:Msparc64} == "" +BROKEN_OPTIONS+=LOADER_OFW +.endif +# UBOOT is only for arm, mips and powerpc, exclude others +.if ${__T:Marm*} == "" && ${__T:Mmips*} == "" && ${__T:Mpowerpc*} == "" +BROKEN_OPTIONS+=LOADER_UBOOT +.endif + .if ${__T:Mmips64*} # profiling won't work on MIPS64 because there is only assembly for o32 BROKEN_OPTIONS+=PROFILE -- cgit v1.1