git: 422911ca5873 - stable/14 - NOTES: Move OFED options to MI NOTES

The branch stable/14 has been updated by jhb:

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

commit 422911ca5873bd945e52d60f99b135488d3b6846
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-04-09 22:02:58 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-07-18 17:06:06 +0000

    NOTES: Move OFED options to MI NOTES
    
    Disable in armv7 NOTES to match sys/modules/Makefile
    
    Reviewed by:    imp
    Sponsored by:   Chelsio Communications
    Differential Revision:  https://reviews.freebsd.org/D44686
    
    (cherry picked from commit 973d3a82096bc135f6c230e348e2f33c382096bc)
---
 sys/amd64/conf/NOTES | 13 -------------
 sys/arm/conf/NOTES   |  5 +++++
 sys/conf/NOTES       | 13 +++++++++++++
 sys/i386/conf/NOTES  | 13 -------------
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 9c91a4fa9bbb..761728337ac2 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -90,19 +90,6 @@ options 	DEVICE_POLLING
 
 options 	BPF_JITTER
 
-# OpenFabrics Enterprise Distribution (Infiniband).
-options 	OFED
-options 	OFED_DEBUG_INIT
-
-# Sockets Direct Protocol
-options 	SDP
-options 	SDP_DEBUG
-
-# IP over Infiniband
-options 	IPOIB
-options 	IPOIB_DEBUG
-options 	IPOIB_CM
-
 
 #####################################################################
 # CLOCK OPTIONS
diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index 74ee03dd4764..e868d6b60496 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -66,6 +66,11 @@ nooptions	COMPAT_FREEBSD9
 nooptions	PPC_PROBE_CHIPSET
 nooptions	MAXCPU		# value is set in machine/param.h
 
+nooptions 	OFED
+nooptions 	SDP
+nooptions 	IPOIB
+nooptions 	IPOIB_CM
+
 nodevice	sym
 
 nodevice	ccr
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index c6434d1ea85d..5da6c6292c83 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -768,6 +768,19 @@ options 	SCTP_PACKET_LOGGING
 options 	SCTP_LTRACE_CHUNKS
 options 	SCTP_LTRACE_ERRORS
 
+# OpenFabrics Enterprise Distribution (Infiniband).
+options 	OFED
+options 	OFED_DEBUG_INIT
+
+# Sockets Direct Protocol
+options 	SDP
+options 	SDP_DEBUG
+
+# IP over Infiniband
+options 	IPOIB
+options 	IPOIB_DEBUG
+options 	IPOIB_CM
+
 # altq(9). Enable the base part of the hooks with the ALTQ option.
 # Individual disciplines must be built into the base system and can not be
 # loaded as modules at this point. ALTQ requires a stable TSC so if yours is
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index ce115b1640e0..45613c10c583 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -238,19 +238,6 @@ options 	DEVICE_POLLING
 
 options 	BPF_JITTER
 
-# OpenFabrics Enterprise Distribution (Infiniband).
-options 	OFED
-options 	OFED_DEBUG_INIT
-
-# Sockets Direct Protocol
-options 	SDP
-options 	SDP_DEBUG
-
-# IP over Infiniband
-options 	IPOIB
-options 	IPOIB_DEBUG
-options 	IPOIB_CM
-
 
 #####################################################################
 # CLOCK OPTIONS