ANDROID: GKI: Fix up "do not export symbol_get/put()" commit

When removing the export from symbol_get/put(), I disabled lots of different drivers in the allmodconfig build file. As some pointed out, that's not the nicest thing to do, as we really do want the build coverage, so instead, "tweak" the Kconfig files to make the problamatic modules be built-in to the kernel image. That removes the problem of the export going away and still gives us good build testing coverage, without modifying any real-world device configurations. Note, 3 config options are "turned off" so they can not be selected, as they could not be worked around in any semi-sane manner: VIDEO_CX23885 DELL_LAPTOP SAMPLE_HW_BREAKPOINT none of which affects any known Android devices. Bug: 162613590 Fixes: 882b7ca141 ("ANDROID: GKI: do not export symbol_get/put()") Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ia28f73a64566438940b876a5d9c1a0137c6304d0
2020-07-28 19:52:00 +02:00 · 2020-07-28 19:52:00 +02:00 · a35cf72836
commit a35cf72836
parent 53b501f197
42 changed files with 90 additions and 119 deletions
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@ -19,7 +19,7 @@ menuconfig VIRTUALIZATION
 if VIRTUALIZATION

 config KVM
-	tristate "Kernel-based Virtual Machine (KVM) support"
+	bool "Kernel-based Virtual Machine (KVM) support"
 	depends on HAVE_KVM
 	depends on HIGH_RES_TIMERS
 	# for TASKSTATS/TASK_DELAY_ACCT:
--- a/build.config.allmodconfig
+++ b/build.config.allmodconfig
@ -1,36 +1,5 @@
 DEFCONFIG=allmodconfig

-# When trying to prevent others from using symbol_get/put we need to exclude a
-# number of in-kernel modules that use those functions.
-SYMBOL_GET_USERS="			\
-	-d CAIF				\
-	-d DELL_LAPTOP			\
-	-d DRM_I915			\
-	-d DVB_USB			\
-	-d DVB_USB_V2			\
-	-d FSL_ENETC			\
-	-d FSL_ENETC_VF			\
-	-d INTEL_IPS			\
-	-d KVM				\
-	-d MEDIA_DIGITAL_TV_SUPPORT	\
-	-d MEDIA_PCI_SUPPORT		\
-	-d MEDIA_RADIO_SUPPORT		\
-	-d MTD_CFI			\
-	-d MTD_GEN_PROBE		\
-	-d MTD_HYPERBUS			\
-	-d MTD_JEDECPROBE		\
-	-d MTD_TS5500			\
-	-d NFS_V4			\
-	-d SAMPLE_HW_BREAKPOINT		\
-	-d VFIO				\
-	-d VIDEO_CX231XX		\
-	-d VIDEO_EM28XX			\
-	-d VIDEO_GO7007			\
-	-d VIDEO_PVRUSB2		\
-	-d VIDEO_TM6000			\
-	-d VIDEO_USBVISION		\
-"
-
 POST_DEFCONFIG_CMDS="update_config"
 function update_config() {
    ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
@ -38,7 +7,6 @@ function update_config() {
         -d CPU_BIG_ENDIAN \
         -d STM \
         -d TEST_MEMCAT_P \
-         ${SYMBOL_GET_USERS} \
         -e UNWINDER_FRAME_POINTER \

    (cd ${OUT_DIR} && \
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 menuconfig AGP
-	tristate "/dev/agpgart (AGP Support)"
+	bool "/dev/agpgart (AGP Support)"
 	depends on ALPHA || IA64 || PARISC || PPC || X86
 	depends on PCI
 	---help---
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@ -6,7 +6,7 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 #
 menuconfig DRM
-	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
+	bool "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
 	depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA
 	select DRM_PANEL_ORIENTATION_QUIRKS
 	select HDMI
@ -55,7 +55,7 @@ config DRM_DEBUG_MM
 	  If in doubt, say "N".

 config DRM_DEBUG_SELFTEST
-	tristate "kselftests for DRM"
+	bool "kselftests for DRM"
 	depends on DRM
 	depends on DEBUG_KERNEL
 	select PRIME_NUMBERS
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DRM_I915
-	tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
+	bool "Intel 8xx/9xx/G3x/G4x/HD Graphics"
 	depends on DRM
 	depends on X86 && PCI
 	select INTEL_GTT
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
@ -7,7 +7,7 @@ menu "I2C Algorithms"
 	visible if !I2C_HELPER_AUTO

 config I2C_ALGOBIT
-	tristate "I2C bit-banging interfaces"
+	bool "I2C bit-banging interfaces"

 config I2C_ALGOPCF
 	tristate "I2C PCF 8584 interfaces"
--- a/drivers/media/common/b2c2/Kconfig
+++ b/drivers/media/common/b2c2/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_B2C2_FLEXCOP
-	tristate
+	bool
 	depends on DVB_CORE && I2C
 	depends on DVB_B2C2_FLEXCOP_PCI || DVB_B2C2_FLEXCOP_USB
 	default y
--- a/drivers/media/pci/bt8xx/Kconfig
+++ b/drivers/media/pci/bt8xx/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_BT848
-	tristate "BT848 Video For Linux"
+	bool "BT848 Video For Linux"
 	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2
 	select I2C_ALGOBIT
 	select VIDEOBUF_DMA_SG
@ -23,7 +23,7 @@ config VIDEO_BT848
 	  module will be called bttv.

 config DVB_BT8XX
-	tristate "DVB/ATSC Support for bt878 based TV cards"
+	bool "DVB/ATSC Support for bt878 based TV cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_BT848
 	select DVB_MT352 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_SP887X if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/pci/cx18/Kconfig
+++ b/drivers/media/pci/cx18/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_CX18
-	tristate "Conexant cx23418 MPEG encoder support"
+	bool "Conexant cx23418 MPEG encoder support"
 	depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C
 	select I2C_ALGOBIT
 	select VIDEOBUF_VMALLOC
--- a/drivers/media/pci/cx23885/Kconfig
+++ b/drivers/media/pci/cx23885/Kconfig
@ -2,6 +2,7 @@
 config VIDEO_CX23885
 	tristate "Conexant cx23885 (2388x successor) support"
 	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT && SND
+	depends on BROKEN
 	select SND_PCM
 	select I2C_ALGOBIT
 	select VIDEO_TUNER
--- a/drivers/media/pci/cx88/Kconfig
+++ b/drivers/media/pci/cx88/Kconfig
@ -31,7 +31,7 @@ config VIDEO_CX88_ALSA
 	  module will be called cx88-alsa.

 config VIDEO_CX88_BLACKBIRD
-	tristate "Blackbird MPEG encoder support (cx2388x + cx23416)"
+	bool "Blackbird MPEG encoder support (cx2388x + cx23416)"
 	depends on VIDEO_CX88
 	select VIDEO_CX2341X
 	help
@ -43,7 +43,7 @@ config VIDEO_CX88_BLACKBIRD
 	  module will be called cx88-blackbird.

 config VIDEO_CX88_DVB
-	tristate "DVB/ATSC Support for cx2388x based TV cards"
+	bool "DVB/ATSC Support for cx2388x based TV cards"
 	depends on VIDEO_CX88 && DVB_CORE
 	select VIDEOBUF2_DVB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/pci/ddbridge/Kconfig
+++ b/drivers/media/pci/ddbridge/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_DDBRIDGE
-	tristate "Digital Devices bridge support"
+	bool "Digital Devices bridge support"
 	depends on DVB_CORE && PCI && I2C
 	select DVB_LNBP21 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV6110x if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/pci/dm1105/Kconfig
+++ b/drivers/media/pci/dm1105/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_DM1105
-	tristate "SDMC DM1105 based PCI cards"
+	bool "SDMC DM1105 based PCI cards"
 	depends on DVB_CORE && PCI && I2C && I2C_ALGOBIT
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/pci/mantis/Kconfig
+++ b/drivers/media/pci/mantis/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config MANTIS_CORE
-	tristate "Mantis/Hopper PCI bridge based devices"
+	bool "Mantis/Hopper PCI bridge based devices"
 	depends on PCI && I2C && INPUT && RC_CORE

 	help
@ -9,7 +9,7 @@ config MANTIS_CORE
 	  Say Y if you own such a device and want to use it.

 config DVB_MANTIS
-	tristate "MANTIS based cards"
+	bool "MANTIS based cards"
 	depends on MANTIS_CORE && DVB_CORE && PCI && I2C
 	select DVB_MB86A16 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
@ -28,7 +28,7 @@ config DVB_MANTIS
 	  If unsure say N.

 config DVB_HOPPER
-	tristate "HOPPER based cards"
+	bool "HOPPER based cards"
 	depends on MANTIS_CORE && DVB_CORE && PCI && I2C
 	select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_PLL
--- a/drivers/media/pci/netup_unidvb/Kconfig
+++ b/drivers/media/pci/netup_unidvb/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_NETUP_UNIDVB
-	tristate "NetUP Universal DVB card support"
+	bool "NetUP Universal DVB card support"
 	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && SPI_MASTER
 	select VIDEOBUF2_DVB
 	select VIDEOBUF2_VMALLOC
--- a/drivers/media/pci/ngene/Kconfig
+++ b/drivers/media/pci/ngene/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_NGENE
-	tristate "Micronas nGene support"
+	bool "Micronas nGene support"
 	depends on DVB_CORE && PCI && I2C
 	select DVB_LNBP21 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV6110x if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/pci/saa7134/Kconfig
+++ b/drivers/media/pci/saa7134/Kconfig
@ -30,13 +30,13 @@ config VIDEO_SAA7134_RC
 	bool "Philips SAA7134 Remote Controller support"
 	depends on RC_CORE
 	depends on VIDEO_SAA7134
-	depends on !(RC_CORE=m && VIDEO_SAA7134=y)
+	#depends on !(RC_CORE=m && VIDEO_SAA7134=y)
 	default y
 	help
 	  Enables Remote Controller support on saa7134 driver.

 config VIDEO_SAA7134_DVB
-	tristate "DVB/ATSC Support for saa7134 based TV cards"
+	bool "DVB/ATSC Support for saa7134 based TV cards"
 	depends on VIDEO_SAA7134 && DVB_CORE
 	select VIDEOBUF2_DVB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/pci/saa7164/Kconfig
+++ b/drivers/media/pci/saa7164/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_SAA7164
-	tristate "NXP SAA7164 support"
+	bool "NXP SAA7164 support"
 	depends on DVB_CORE && VIDEO_DEV && PCI && I2C
 	select I2C_ALGOBIT
 	select FW_LOADER
--- a/drivers/media/pci/smipcie/Kconfig
+++ b/drivers/media/pci/smipcie/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_SMIPCIE
-	tristate "SMI PCIe DVBSky cards"
+	bool "SMI PCIe DVBSky cards"
 	depends on DVB_CORE && PCI && I2C
 	select I2C_ALGOBIT
 	select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/pci/ttpci/Kconfig
+++ b/drivers/media/pci/ttpci/Kconfig
@ -5,7 +5,7 @@ config DVB_AV7110_IR
 	default DVB_AV7110

 config DVB_AV7110
-	tristate "AV7110 cards"
+	bool "AV7110 cards"
 	depends on DVB_CORE && PCI && I2C
 	select TTPCI_EEPROM
 	select VIDEO_SAA7146_VV
@ -40,7 +40,7 @@ config DVB_AV7110
 config DVB_AV7110_OSD
 	bool "AV7110 OSD support"
 	depends on DVB_AV7110
-	default y if DVB_AV7110=y || DVB_AV7110=m
+	default y if DVB_AV7110=y
 	help
 	  The AV7110 firmware provides some code to generate an OnScreenDisplay
 	  on the video output. This is kind of nonstandard and not guaranteed to
@ -52,7 +52,7 @@ config DVB_AV7110_OSD
 	  All other people say N.

 config DVB_BUDGET_CORE
-	tristate "SAA7146 DVB cards (aka Budget, Nova-PCI)"
+	bool "SAA7146 DVB cards (aka Budget, Nova-PCI)"
 	depends on DVB_CORE && PCI && I2C
 	select VIDEO_SAA7146
 	select TTPCI_EEPROM
@ -62,7 +62,7 @@ config DVB_BUDGET_CORE
 	  MPEG2 decoder.

 config DVB_BUDGET
-	tristate "Budget cards"
+	bool "Budget cards"
 	depends on DVB_BUDGET_CORE && I2C
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT
@ -88,7 +88,7 @@ config DVB_BUDGET
 	  module will be called budget.

 config DVB_BUDGET_CI
-	tristate "Budget cards with onboard CI connector"
+	bool "Budget cards with onboard CI connector"
 	depends on DVB_BUDGET_CORE && I2C
 	select DVB_STV0297 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
@ -115,7 +115,7 @@ config DVB_BUDGET_CI
 	  module will be called budget-ci.

 config DVB_BUDGET_AV
-	tristate "Budget cards with analog video inputs"
+	bool "Budget cards with analog video inputs"
 	depends on DVB_BUDGET_CORE && I2C
 	select VIDEO_SAA7146_VV
 	depends on VIDEO_DEV	# dependencies of VIDEO_SAA7146_VV
@ -138,7 +138,7 @@ config DVB_BUDGET_AV
 	  module will be called budget-av.

 config DVB_BUDGET_PATCH
-	tristate "AV7110 cards with Budget Patch"
+	bool "AV7110 cards with Budget Patch"
 	depends on DVB_BUDGET_CORE && I2C
 	depends on DVB_AV7110
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/platform/sti/c8sectpfe/Kconfig
+++ b/drivers/media/platform/sti/c8sectpfe/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_C8SECTPFE
-	tristate "STMicroelectronics C8SECTPFE DVB support"
+	bool "STMicroelectronics C8SECTPFE DVB support"
 	depends on PINCTRL && DVB_CORE && I2C
 	depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST
 	select FW_LOADER
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only

 menuconfig RC_CORE
-	tristate "Remote Controller support"
+	bool "Remote Controller support"
 	depends on INPUT
 	help
 	  Enable support for Remote Controllers on Linux. This is
--- a/drivers/media/spi/Kconfig
+++ b/drivers/media/spi/Kconfig
@ -21,7 +21,7 @@ if SPI
 menu "Media SPI Adapters"

 config CXD2880_SPI_DRV
-	tristate "Sony CXD2880 SPI support"
+	bool "Sony CXD2880 SPI support"
 	depends on DVB_CORE && SPI
 	default m if !MEDIA_SUBDRV_AUTOSELECT
 	help
--- a/drivers/media/usb/as102/Kconfig
+++ b/drivers/media/usb/as102/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_AS102
-	tristate "Abilis AS102 DVB receiver"
+	bool "Abilis AS102 DVB receiver"
 	depends on DVB_CORE && USB && I2C && INPUT
 	select FW_LOADER
 	help
--- a/drivers/media/usb/au0828/Kconfig
+++ b/drivers/media/usb/au0828/Kconfig
@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only

 config VIDEO_AU0828
-	tristate "Auvitek AU0828 support"
+	bool "Auvitek AU0828 support"
 	depends on I2C && INPUT && DVB_CORE && USB && VIDEO_V4L2
 	select MEDIA_CONTROLLER
 	select MEDIA_CONTROLLER_DVB
@ -35,7 +35,7 @@ config VIDEO_AU0828_V4L2
 config VIDEO_AU0828_RC
 	bool "AU0828 Remote Controller support"
 	depends on RC_CORE
-	depends on !(RC_CORE=m && VIDEO_AU0828=y)
+	#depends on !(RC_CORE=m && VIDEO_AU0828=y)
 	depends on VIDEO_AU0828
 	help
 	   Enables Remote Controller support on au0828 driver.
--- a/drivers/media/usb/cx231xx/Kconfig
+++ b/drivers/media/usb/cx231xx/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_CX231XX
-	tristate "Conexant cx231xx USB video capture support"
+	bool "Conexant cx231xx USB video capture support"
 	depends on VIDEO_DEV && I2C && I2C_MUX
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
@ -39,7 +39,7 @@ config VIDEO_CX231XX_ALSA
 	  module will be called cx231xx-alsa

 config VIDEO_CX231XX_DVB
-	tristate "DVB/ATSC Support for Cx231xx based TV cards"
+	bool "DVB/ATSC Support for Cx231xx based TV cards"
 	depends on VIDEO_CX231XX && DVB_CORE
 	select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT
 	select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_USB_V2
-	tristate "Support for various USB DVB devices v2"
+	bool "Support for various USB DVB devices v2"
 	depends on DVB_CORE && USB && I2C && (RC_CORE || RC_CORE=n)
 	help
 	  By enabling this you will be able to choose the various supported
@ -15,7 +15,7 @@ config DVB_USB_V2
 	  Say Y if you own a USB DVB device.

 config DVB_USB_AF9015
-	tristate "Afatech AF9015 DVB-T USB2.0 support"
+	bool "Afatech AF9015 DVB-T USB2.0 support"
 	depends on DVB_USB_V2 && I2C_MUX
 	select REGMAP
 	select DVB_AF9013
@ -31,7 +31,7 @@ config DVB_USB_AF9015
 	  Say Y here to support the Afatech AF9015 based DVB-T USB2.0 receiver

 config DVB_USB_AF9035
-	tristate "Afatech AF9035 DVB-T USB2.0 support"
+	bool "Afatech AF9035 DVB-T USB2.0 support"
 	depends on DVB_USB_V2
 	select DVB_AF9033
 	select MEDIA_TUNER_TUA9001 if MEDIA_SUBDRV_AUTOSELECT
@ -44,7 +44,7 @@ config DVB_USB_AF9035
 	  Say Y here to support the Afatech AF9035 based DVB USB receiver.

 config DVB_USB_ANYSEE
-	tristate "Anysee DVB-T/C USB2.0 support"
+	bool "Anysee DVB-T/C USB2.0 support"
 	depends on DVB_USB_V2
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_MT352 if MEDIA_SUBDRV_AUTOSELECT
@ -61,7 +61,7 @@ config DVB_USB_ANYSEE
 	  Anysee E30 C Plus DVB USB2.0 receiver.

 config DVB_USB_AU6610
-	tristate "Alcor Micro AU6610 USB2.0 support"
+	bool "Alcor Micro AU6610 USB2.0 support"
 	depends on DVB_USB_V2
 	select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
 	select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT
@ -69,7 +69,7 @@ config DVB_USB_AU6610
 	  Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver.

 config DVB_USB_AZ6007
-	tristate "AzureWave 6007 and clones DVB-T/C USB2.0 support"
+	bool "AzureWave 6007 and clones DVB-T/C USB2.0 support"
 	depends on DVB_USB_V2
 	select CYPRESS_FIRMWARE
 	select DVB_DRXK if MEDIA_SUBDRV_AUTOSELECT
@ -78,7 +78,7 @@ config DVB_USB_AZ6007
 	  Say Y here to support the AZ6007 receivers like Terratec H7.

 config DVB_USB_CE6230
-	tristate "Intel CE6230 DVB-T USB2.0 support"
+	bool "Intel CE6230 DVB-T USB2.0 support"
 	depends on DVB_USB_V2
 	select DVB_ZL10353
 	select MEDIA_TUNER_MXL5005S if MEDIA_SUBDRV_AUTOSELECT
@ -86,7 +86,7 @@ config DVB_USB_CE6230
 	  Say Y here to support the Intel CE6230 DVB-T USB2.0 receiver

 config DVB_USB_EC168
-	tristate "E3C EC168 DVB-T USB2.0 support"
+	bool "E3C EC168 DVB-T USB2.0 support"
 	depends on DVB_USB_V2
 	select DVB_EC100
 	select MEDIA_TUNER_MXL5005S if MEDIA_SUBDRV_AUTOSELECT
@ -94,7 +94,7 @@ config DVB_USB_EC168
 	  Say Y here to support the E3C EC168 DVB-T USB2.0 receiver.

 config DVB_USB_GL861
-	tristate "Genesys Logic GL861 USB2.0 support"
+	bool "Genesys Logic GL861 USB2.0 support"
 	depends on DVB_USB_V2
 	select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_TC90522 if MEDIA_SUBDRV_AUTOSELECT
@ -106,7 +106,7 @@ config DVB_USB_GL861
 	  with USB ID 0x7a69:0001.

 config DVB_USB_LME2510
-	tristate "LME DM04/QQBOX DVB-S USB2.0 support"
+	bool "LME DM04/QQBOX DVB-S USB2.0 support"
 	depends on DVB_USB_V2
 	depends on RC_CORE
 	select DVB_TDA10086 if MEDIA_SUBDRV_AUTOSELECT
@ -121,7 +121,7 @@ config DVB_USB_LME2510
 	  Say Y here to support the LME DM04/QQBOX DVB-S USB2.0

 config DVB_USB_MXL111SF
-	tristate "MxL111SF DTV USB2.0 support"
+	bool "MxL111SF DTV USB2.0 support"
 	depends on DVB_USB_V2
 	select DVB_LGDT3305 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_LG2160 if MEDIA_SUBDRV_AUTOSELECT
@ -130,7 +130,7 @@ config DVB_USB_MXL111SF
 	  Say Y here to support the MxL111SF USB2.0 DTV receiver.

 config DVB_USB_RTL28XXU
-	tristate "Realtek RTL28xxU DVB USB support"
+	bool "Realtek RTL28xxU DVB USB support"
 	depends on DVB_USB_V2 && I2C_MUX
 	select DVB_MN88472 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_MN88473 if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/usb/dvb-usb/Kconfig
+++ b/drivers/media/usb/dvb-usb/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_USB
-	tristate "Support for various USB DVB devices"
+	bool "Support for various USB DVB devices"
 	depends on DVB_CORE && USB && I2C && RC_CORE
 	help
 	  By enabling this you will be able to choose the various supported
@ -41,7 +41,7 @@ config DVB_USB_A800
 	  Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.

 config DVB_USB_DIBUSB_MB
-	tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)"
+	bool "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)"
 	depends on DVB_USB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_DIB3000MB
@ -64,7 +64,7 @@ config DVB_USB_DIBUSB_MB_FAULTY
 	  Support for faulty USB IDs due to an invalid EEPROM on some Artec devices.

 config DVB_USB_DIBUSB_MC
-	tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"
+	bool "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"
 	depends on DVB_USB
 	select DVB_USB_DIB3000MC
 	select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
@ -79,7 +79,7 @@ config DVB_USB_DIBUSB_MC
 	  a module.

 config DVB_USB_DIB0700
-	tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)"
+	bool "DiBcom DiB0700 USB DVB devices (see help for supported devices)"
 	depends on DVB_USB
 	select DVB_DIB7000P if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_DIB7000M if MEDIA_SUBDRV_AUTOSELECT
@ -110,7 +110,7 @@ config DVB_USB_DIB0700
 	  a module.

 config DVB_USB_UMT_010
-	tristate "HanfTek UMT-010 DVB-T USB2.0 support"
+	bool "HanfTek UMT-010 DVB-T USB2.0 support"
 	depends on DVB_USB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_USB_DIB3000MC
@ -120,7 +120,7 @@ config DVB_USB_UMT_010
 	  Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.

 config DVB_USB_CXUSB
-	tristate "Conexant USB2.0 hybrid reference design support"
+	bool "Conexant USB2.0 hybrid reference design support"
 	depends on DVB_USB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_CX22702 if MEDIA_SUBDRV_AUTOSELECT
@ -158,7 +158,7 @@ config DVB_USB_CXUSB_ANALOG
 	  Currently this mode is supported only on a Medion MD95700 device.

 config DVB_USB_M920X
-	tristate "Uli m920x DVB-T USB2.0 support"
+	bool "Uli m920x DVB-T USB2.0 support"
 	depends on DVB_USB
 	select DVB_MT352 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_TDA1004X if MEDIA_SUBDRV_AUTOSELECT
@ -172,7 +172,7 @@ config DVB_USB_M920X
 	  Firmware required.

 config DVB_USB_DIGITV
-	tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
+	bool "Nebula Electronics uDigiTV DVB-T USB2.0 support"
 	depends on DVB_USB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_NXT6000 if MEDIA_SUBDRV_AUTOSELECT
@ -207,7 +207,7 @@ config DVB_USB_VP702X
 	  DVB-S USB2.0 receivers.

 config DVB_USB_GP8PSK
-	tristate "GENPIX 8PSK->USB module support"
+	bool "GENPIX 8PSK->USB module support"
 	depends on DVB_USB
 	help
 	  Say Y here to support the
@ -225,7 +225,7 @@ config DVB_USB_NOVA_T_USB2
 	  Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.

 config DVB_USB_TTUSB2
-	tristate "Pinnacle 400e DVB-S USB2.0 support"
+	bool "Pinnacle 400e DVB-S USB2.0 support"
 	depends on DVB_USB
 	select DVB_TDA10086 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_LNBP21 if MEDIA_SUBDRV_AUTOSELECT
@ -250,7 +250,7 @@ config DVB_USB_DTT200U
 	  The WT-220U and its clones are pen-sized.

 config DVB_USB_OPERA1
-	tristate "Opera1 DVB-S USB2.0 receiver"
+	bool "Opera1 DVB-S USB2.0 receiver"
 	depends on DVB_USB
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
@ -258,7 +258,7 @@ config DVB_USB_OPERA1
 	  Say Y here to support the Opera DVB-S USB2.0 receiver.

 config DVB_USB_AF9005
-	tristate "Afatech AF9005 DVB-T USB1.1 support"
+	bool "Afatech AF9005 DVB-T USB1.1 support"
 	depends on DVB_USB
 	select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
 	select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT
@ -274,7 +274,7 @@ config DVB_USB_AF9005_REMOTE
 	  Afatech AF9005 based receiver.

 config DVB_USB_PCTV452E
-	tristate "Pinnacle PCTV HDTV Pro USB device/TT Connect S2-3600"
+	bool "Pinnacle PCTV HDTV Pro USB device/TT Connect S2-3600"
 	depends on DVB_USB
 	select TTPCI_EEPROM
 	select DVB_LNBP22 if MEDIA_SUBDRV_AUTOSELECT
@ -287,7 +287,7 @@ config DVB_USB_PCTV452E
 	  Say Y if you own such a device and want to use it.

 config DVB_USB_DW2102
-	tristate "DvbWorld & TeVii DVB-S/S2 USB2.0 support"
+	bool "DvbWorld & TeVii DVB-S/S2 USB2.0 support"
 	depends on DVB_USB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
@ -318,7 +318,7 @@ config DVB_USB_CINERGY_T2
 	  Say Y if you own such a device and want to use it.

 config DVB_USB_DTV5100
-	tristate "AME DTV-5100 USB2.0 DVB-T support"
+	bool "AME DTV-5100 USB2.0 DVB-T support"
 	depends on DVB_USB
 	select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
 	select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT
@ -334,7 +334,7 @@ config DVB_USB_AZ6027
 	  Say Y here to support the AZ6027 device

 config DVB_USB_TECHNISAT_USB2
-	tristate "Technisat DVB-S/S2 USB2.0 support"
+	bool "Technisat DVB-S/S2 USB2.0 support"
 	depends on DVB_USB
 	select DVB_STV090x if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV6110x if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/media/usb/em28xx/Kconfig
+++ b/drivers/media/usb/em28xx/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_EM28XX
-	tristate "Empia EM28xx USB devices support"
+	bool "Empia EM28xx USB devices support"
 	depends on VIDEO_DEV && I2C
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
@ -36,7 +36,7 @@ config VIDEO_EM28XX_ALSA
 	  module will be called em28xx-alsa

 config VIDEO_EM28XX_DVB
-	tristate "DVB/ATSC Support for em28xx based TV cards"
+	bool "DVB/ATSC Support for em28xx based TV cards"
 	depends on VIDEO_EM28XX && DVB_CORE
 	select DVB_LGDT330X if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_LGDT3305 if MEDIA_SUBDRV_AUTOSELECT
@ -75,7 +75,7 @@ config VIDEO_EM28XX_RC
 	tristate "EM28XX Remote Controller support"
 	depends on RC_CORE
 	depends on VIDEO_EM28XX
-	depends on !(RC_CORE=m && VIDEO_EM28XX=y)
+	#depends on !(RC_CORE=m && VIDEO_EM28XX=y)
 	default VIDEO_EM28XX
 	help
 	  Enables Remote Controller support on em28xx driver.
--- a/drivers/media/usb/pvrusb2/Kconfig
+++ b/drivers/media/usb/pvrusb2/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_PVRUSB2
-	tristate "Hauppauge WinTV-PVR USB2 support"
+	bool "Hauppauge WinTV-PVR USB2 support"
 	depends on VIDEO_V4L2 && I2C
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
--- a/drivers/media/usb/tm6000/Kconfig
+++ b/drivers/media/usb/tm6000/Kconfig
@ -27,7 +27,7 @@ config VIDEO_TM6000_ALSA
 	  module will be called tm6000-alsa.

 config VIDEO_TM6000_DVB
-	tristate "DVB Support for tm6000 based TV cards"
+	bool "DVB Support for tm6000 based TV cards"
 	depends on VIDEO_TM6000 && DVB_CORE && USB
 	select DVB_ZL10353
 	help
--- a/drivers/media/usb/ttusb-budget/Kconfig
+++ b/drivers/media/usb/ttusb-budget/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_TTUSB_BUDGET
-	tristate "Technotrend/Hauppauge Nova-USB devices"
+	bool "Technotrend/Hauppauge Nova-USB devices"
 	depends on DVB_CORE && USB && I2C && PCI
 	select DVB_CX22700 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_TDA1004X if MEDIA_SUBDRV_AUTOSELECT
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@ -3,7 +3,7 @@ menu "RAM/ROM/Flash chip drivers"
 	depends on MTD!=n

 config MTD_CFI
-	tristate "Detect flash chips by Common Flash Interface (CFI) probe"
+	bool "Detect flash chips by Common Flash Interface (CFI) probe"
 	select MTD_GEN_PROBE
 	select MTD_CFI_UTIL
 	help
@ -15,7 +15,7 @@ config MTD_CFI
 	  for more information on CFI.

 config MTD_JEDECPROBE
-	tristate "Detect non-CFI AMD/JEDEC-compatible flash chips"
+	bool "Detect non-CFI AMD/JEDEC-compatible flash chips"
 	select MTD_GEN_PROBE
 	select MTD_CFI_UTIL
 	help
@ -27,7 +27,7 @@ config MTD_JEDECPROBE
 	  Intel chips.

 config MTD_GEN_PROBE
-	tristate
+	bool

 config MTD_CFI_ADV_OPTIONS
 	bool "Flash chip driver advanced configuration options"
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@ -34,7 +34,7 @@ config CAIF_SPI_SYNC
 	This option also needs to be enabled on the modem.

 config CAIF_HSI
-       tristate "CAIF HSI transport driver"
+       bool "CAIF HSI transport driver"
       depends on CAIF
       default n
       ---help---
--- a/drivers/net/ethernet/freescale/enetc/Kconfig
+++ b/drivers/net/ethernet/freescale/enetc/Kconfig
@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 config FSL_ENETC
-	tristate "ENETC PF driver"
+	bool "ENETC PF driver"
 	depends on PCI && PCI_MSI && (ARCH_LAYERSCAPE || COMPILE_TEST)
 	select PHYLIB
 	help
@ -11,7 +11,7 @@ config FSL_ENETC
 	  If compiled as module (M), the module name is fsl-enetc.

 config FSL_ENETC_VF
-	tristate "ENETC VF driver"
+	bool "ENETC VF driver"
 	depends on PCI && PCI_MSI && (ARCH_LAYERSCAPE || COMPILE_TEST)
 	select PHYLIB
 	help
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@ -175,6 +175,7 @@ config DELL_LAPTOP
 	depends on RFKILL || RFKILL = n
 	depends on SERIO_I8042
 	depends on DELL_SMBIOS
+	depends on BROKEN
 	select POWER_SUPPLY
 	select LEDS_CLASS
 	select NEW_LEDS
@ -1016,7 +1017,7 @@ config INTEL_MFLD_THERMAL
         platform.

 config INTEL_IPS
-	tristate "Intel Intelligent Power Sharing"
+	bool "Intel Intelligent Power Sharing"
 	depends on ACPI && PCI
 	---help---
 	  Intel Calpella platforms support dynamic power sharing between the
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@ -42,7 +42,7 @@ config USB_ARCH_HAS_HCD
 	def_bool y

 config USB
-	tristate "Support for Host-side USB"
+	bool "Support for Host-side USB"
 	depends on USB_ARCH_HAS_HCD
 	select GENERIC_ALLOCATOR
 	select USB_COMMON
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@ -449,7 +449,7 @@ source "drivers/usb/gadget/udc/aspeed-vhub/Kconfig"

 config USB_DUMMY_HCD
 	tristate "Dummy HCD (DEVELOPMENT)"
-	depends on USB=y || (USB=m && USB_GADGET=m)
+	depends on USB=y
 	help
 	  This host controller driver emulates USB, looping all data transfer
 	  requests back to a USB "gadget driver" in the same host.  The host
--- a/drivers/vfio/Kconfig
+++ b/drivers/vfio/Kconfig
@ -20,7 +20,7 @@ config VFIO_VIRQFD
 	default n

 menuconfig VFIO
-	tristate "VFIO Non-Privileged userspace driver framework"
+	bool "VFIO Non-Privileged userspace driver framework"
 	depends on IOMMU_API
 	select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM || ARM64)
 	help
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@ -41,7 +41,7 @@ config NFS_V2
 	  If unsure, say Y.

 config NFS_V3
-	tristate "NFS client support for NFS version 3"
+	bool "NFS client support for NFS version 3"
 	depends on NFS_FS
 	default y
 	help
@ -73,7 +73,7 @@ config NFS_V3_ACL
 	  If unsure, say N.

 config NFS_V4
-	tristate "NFS client support for NFS version 4"
+	bool "NFS client support for NFS version 4"
 	depends on NFS_FS
 	select SUNRPC_GSS
 	select KEYS
@ -120,12 +120,12 @@ config PNFS_FILE_LAYOUT
 	default NFS_V4

 config PNFS_BLOCK
-	tristate
+	bool
 	depends on NFS_V4_1 && BLK_DEV_DM
 	default NFS_V4

 config PNFS_FLEXFILE_LAYOUT
-	tristate
+	bool
 	depends on NFS_V4_1 && NFS_V3
 	default m

--- a/net/caif/Kconfig
+++ b/net/caif/Kconfig
@ -4,7 +4,7 @@
 #

 menuconfig CAIF
-	tristate "CAIF support"
+	bool "CAIF support"
 	select CRC_CCITT
 	default n
 	---help---
--- a/samples/Kconfig
+++ b/samples/Kconfig
@ -42,6 +42,7 @@ config SAMPLE_KRETPROBES
 config SAMPLE_HW_BREAKPOINT
 	tristate "Build kernel hardware breakpoint examples -- loadable module only"
 	depends on HAVE_HW_BREAKPOINT && m
+	depends on BROKEN
 	help
 	  This builds kernel hardware breakpoint example modules.