git: 68cbb072fd1c - main - Revert "config.mk: Add MK_VIMAGE knob"

The branch main has been updated by brooks:

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

commit 68cbb072fd1c7f0928efbb466f278e6c2e0a2024
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-04-25 21:38:15 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-04-25 21:43:36 +0000

    Revert "config.mk: Add MK_VIMAGE knob"
    
    This commit broke "make makeman" checks in github CI due to a lack of
    option description files.  The split between VIMAGE and VIMAGE_SUPPORT
    is not clearly justified and the code is broken because there is no
    opt_vimage.h (it's in opt_global.h).
    
    This reverts commit 22ca6db50f4e6bd75a141f57cf953d8de6531a06.
---
 share/mk/src.opts.mk  | 2 --
 sys/conf/config.mk    | 2 --
 sys/conf/kern.opts.mk | 4 +---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index b7196b6fe824..00405e3f934f 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -183,7 +183,6 @@ __DEFAULT_YES_OPTIONS = \
     USB \
     UTMPX \
     VI \
-    VIMAGE \
     VT \
     WIRELESS \
     WPA_SUPPLICANT_EAPOL \
@@ -248,7 +247,6 @@ __LIBC_MALLOC_DEFAULT=	jemalloc
     NETGRAPH \
     PAM \
     TESTS \
-    VIMAGE \
     WIRELESS
 __DEFAULT_DEPENDENT_OPTIONS+= ${var}_SUPPORT/${var}
 .endfor
diff --git a/sys/conf/config.mk b/sys/conf/config.mk
index 6e26ee0d5e66..729111b4ef3a 100644
--- a/sys/conf/config.mk
+++ b/sys/conf/config.mk
@@ -11,9 +11,7 @@ opt_global.h:
 	touch ${.TARGET}
 	@echo "#define SMP 1" >> ${.TARGET}
 	@echo "#define MAC 1" >> ${.TARGET}
-.if ${MK_VIMAGE_SUPPORT} != "no"
 	@echo "#define VIMAGE 1" >> ${.TARGET}
-.endif
 # Note: Define 'options' in DEFAULTS to 1. For simplicity, no check if the
 # option is in opt_global.h. Nearly all the options in DEFAUlTS today are in
 # opt_global.h with GEOM_* being the main exceptions. Move any options from
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 8b1151f3d624..d9d96a133250 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -52,7 +52,6 @@ __DEFAULT_YES_OPTIONS = \
     SPLIT_KERNEL_DEBUG \
     TESTS \
     USB_GADGET_EXAMPLES \
-    VIMAGE \
     ZFS
 
 __DEFAULT_NO_OPTIONS = \
@@ -183,8 +182,7 @@ OPT_${opt}:=	${rep}
 #
 .for var in \
     INET \
-    INET6 \
-    VIMAGE
+    INET6
 .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"
 MK_${var}_SUPPORT:= no
 .else