git: ff975f15d860 - main - WITH_OFED build option: fix

[Konstantin Belousov]

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=ff975f15d86001d5b948ab538de1e4aca852d2f5

commit ff975f15d86001d5b948ab538de1e4aca852d2f5
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-02-02 13:01:26 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-02-02 16:44:52 +0000

    WITH_OFED build option: fix
    
    Userspace has OFED build enabled for quite some time, but kernel modules
    were not. This is useless config because any userspace IB code requires
    kernel support. So enable modules build by default.
    
    Move WITH_OFED to WITHOUT_OFED since defaults are now enabled.
    
    Reviewed by:    emaste, hselasky, kevans
    MFC after:      3 days
    Sponsored by:   NVidia Networking / Mellanox Technologies
    Differential Revision:  https://reviews.freebsd.org/D28460
---
 sys/conf/kern.opts.mk            | 2 +-
 tools/build/options/WITHOUT_OFED | 4 ++++
 tools/build/options/WITH_OFED    | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 5a66849b36da..7361cdd70076 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -41,6 +41,7 @@ __DEFAULT_YES_OPTIONS = \
     ISCSI \
     KERNEL_SYMBOLS \
     NETGRAPH \
+    OFED \
     PF \
     SCTP_SUPPORT \
     SOURCELESS_HOST \
@@ -55,7 +56,6 @@ __DEFAULT_NO_OPTIONS = \
     INIT_ALL_PATTERN \
     INIT_ALL_ZERO \
     KERNEL_RETPOLINE \
-    OFED \
     RATELIMIT \
     REPRODUCIBLE_BUILD
 
diff --git a/tools/build/options/WITHOUT_OFED b/tools/build/options/WITHOUT_OFED
new file mode 100644
index 000000000000..18a6943b3580
--- /dev/null
+++ b/tools/build/options/WITHOUT_OFED
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to disable the build of the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack, including kernel modules and userspace libraries.
diff --git a/tools/build/options/WITH_OFED b/tools/build/options/WITH_OFED
deleted file mode 100644
index a995fb8cdab8..000000000000
--- a/tools/build/options/WITH_OFED
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to build the
-.Dq "OpenFabrics Enterprise Distribution"
-Infiniband software stack.