mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Move EFI up to common makefile. There's no need for all these .if's
based on architecture. Sponsored by: Netflix
This commit is contained in:
parent
6ef82c0ae2
commit
9e74797f30
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=330077
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -11,7 +11,6 @@ SUBDIR+= ficl32
|
|||
SUBDIR+= liblua32
|
||||
.endif
|
||||
|
||||
SUBDIR+= efi
|
||||
SUBDIR+= userboot
|
||||
|
||||
.if ${MK_LOADER_GELI} == "yes"
|
||||
|
|
|
@ -7,4 +7,4 @@ SUBDIR+= fdt
|
|||
SUBDIR+= zfs
|
||||
.endif
|
||||
|
||||
SUBDIR+= efi uboot
|
||||
SUBDIR+= uboot
|
||||
|
|
|
@ -6,5 +6,3 @@ SUBDIR+= fdt
|
|||
.if ${MK_ZFS} != "no"
|
||||
SUBDIR+= zfs
|
||||
.endif
|
||||
|
||||
SUBDIR+= efi
|
||||
|
|
|
@ -6,5 +6,3 @@ SUBDIR+= geli
|
|||
.if ${MK_ZFS} != "no"
|
||||
SUBDIR+= zfs
|
||||
.endif
|
||||
|
||||
SUBDIR+= efi
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue