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 22ca6db50f.
This commit is contained in:
Brooks Davis 2024-04-25 22:38:15 +01:00
parent 8efba70d79
commit 68cbb072fd
3 changed files with 1 additions and 7 deletions

View file

@ -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

View file

@ -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

View file

@ -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