git: 7661a2abe45c - main - src.opts.mk: sync FDT and OFED options with kern.opts.mk
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 07 Mar 2023 18:41:36 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=7661a2abe45cfa144f69898f8498c3cfd88cceb8
commit 7661a2abe45cfa144f69898f8498c3cfd88cceb8
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-03-07 16:39:46 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-03-07 18:40:18 +0000
src.opts.mk: sync FDT and OFED options with kern.opts.mk
Where options exist in both src.opts.mk and kern.opts.mk they should be
kept in sync.
It may be that the option should be flipped the other way (e.g.,
enabling OFED in the kernel on arm64); if so that will be done as a
subsequent commit after further testing.
PR: 269994
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D38952
---
share/mk/src.opts.mk | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 319cdbb0ebee..96b390921d4c 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -95,7 +95,6 @@ __DEFAULT_YES_OPTIONS = \
EFI \
ELFTOOLCHAIN_BOOTSTRAP \
EXAMPLES \
- FDT \
FILE \
FINGER \
FLOPPY \
@@ -283,6 +282,12 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS
.include <bsd.compiler.mk>
+.if ${__T} == "i386" || ${__T} == "amd64"
+__DEFAULT_NO_OPTIONS += FDT
+.else
+__DEFAULT_YES_OPTIONS += FDT
+.endif
+
.if ${__T:Marm*} == "" && ${__T:Mriscv64*} == ""
__DEFAULT_YES_OPTIONS+=LLDB
.else
@@ -348,6 +353,12 @@ __DEFAULT_YES_OPTIONS+=OPENMP
__DEFAULT_NO_OPTIONS+=OPENMP
.endif
+.if ${__T} != "i386" && ${__T} != "amd64" && \
+ ${__T:Mpowerpc64*} == ""
+BROKEN_OPTIONS+= OFED
+.endif
+
+
.if ${__T} == "powerpc"
BROKEN_OPTIONS+= ZFS
.endif