From ee3187f6fa7986c6bfaa97528e050b796eaca343 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 23 Apr 2024 11:47:44 -0700
Subject: [PATCH] Remove the MK_NVME build option

The drivers and utilities are now built and installed unconditionally.

Reviewed by:	imp, emaste
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D44843
---
 share/mk/src.opts.mk             | 1 -
 tools/build/options/WITHOUT_NVME | 1 -
 tools/build/options/WITH_NVME    | 1 -
 3 files changed, 3 deletions(-)
 delete mode 100644 tools/build/options/WITHOUT_NVME
 delete mode 100644 tools/build/options/WITH_NVME

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 3d3a1299fac9..b7196b6fe824 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -149,7 +149,6 @@ __DEFAULT_YES_OPTIONS = \
     NS_CACHING \
     NTP \
     NUAGEINIT \
-    NVME \
     OFED \
     OPENSSL \
     PAM \
diff --git a/tools/build/options/WITHOUT_NVME b/tools/build/options/WITHOUT_NVME
deleted file mode 100644
index 9669deb2ed9e..000000000000
--- a/tools/build/options/WITHOUT_NVME
+++ /dev/null
@@ -1 +0,0 @@
-Do not build nvme related tools and kernel modules.
diff --git a/tools/build/options/WITH_NVME b/tools/build/options/WITH_NVME
deleted file mode 100644
index 053cfc568b10..000000000000
--- a/tools/build/options/WITH_NVME
+++ /dev/null
@@ -1 +0,0 @@
-Build nvme related tools and kernel modules.