| Message ID | 20200321064127.5846-1-ezequiel@collabora.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers |
Received: from vger.kernel.org ([209.132.180.67])
by www.linuxtv.org with esmtp (Exim 4.92)
(envelope-from <linux-media-owner@vger.kernel.org>)
id 1jFXnf-004ezb-Px; Sat, 21 Mar 2020 06:40:04 +0000
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1728030AbgCUGmE (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other);
Sat, 21 Mar 2020 02:42:04 -0400
Received: from bhuna.collabora.co.uk ([46.235.227.227]:45868 "EHLO
bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1727824AbgCUGmE (ORCPT
<rfc822;linux-media@vger.kernel.org>);
Sat, 21 Mar 2020 02:42:04 -0400
Received: from [127.0.0.1] (localhost [127.0.0.1])
(Authenticated sender: ezequiel)
with ESMTPSA id 4110529716D
From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Tomasz Figa <tfiga@chromium.org>,
Nicolas Dufresne <nicolas@ndufresne.ca>, kernel@collabora.com,
Hans Verkuil <hverkuil@xs4all.nl>, Sean Young <sean@mess.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sakari Ailus <sakari.ailus@iki.fi>,
Michael Ira Krufky <mkrufky@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH] media: Refactor configuration options
Date: Sat, 21 Mar 2020 03:41:27 -0300
Message-Id: <20200321064127.5846-1-ezequiel@collabora.com>
X-Mailer: git-send-email 2.26.0.rc2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org
|
| Series |
media: Refactor configuration options
|
|
Commit Message
Ezequiel Garcia
March 21, 2020, 6:41 a.m. UTC
The Media subsystem has a set of configuration options
that control the visibility of other options, the
latter group associated to device driver enablement.
In other words, it currently has two levels:
"support" options and "driver enablement" options.
The "support" configuration options currently are:
* Analog TV support
* Digital TV support
* Camera and grabbers support
* AM/FM radio support
* HDMI CEC support
* SDR support
The "device driver enablement" options are:
* USB devices
* PCI devices
* Platform-specific devices
* Memory-to-memory devices
* DVB devices
* CEC devices
* SDR devices
* ...
In order to simplify the above, refactor the media configuration,
mostly by dropping the "support" options, which don't seem to
be really required.
In other words, the following are removed: MEDIA_ANALOG_TV_SUPPORT,
MEDIA_DIGITAL_TV_SUPPORT, MEDIA_CAMERA_SUPPORT, MEDIA_RADIO_SUPPORT,
MEDIA_CEC_SUPPORT and MEDIA_SDR_SUPPORT.
As a result, the configuration is now simplified. Users
will find USB capture devices under "Media USB Adapters",
or CEC adapters under "CEC platform devices", without
the need to enable any other "support" options.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
drivers/media/Kconfig | 61 ----------------------------
drivers/media/dvb-frontends/Kconfig | 2 +-
drivers/media/i2c/Kconfig | 14 +------
drivers/media/i2c/m5mols/Kconfig | 1 -
drivers/media/i2c/smiapp/Kconfig | 1 -
drivers/media/mc/Kconfig | 1 -
drivers/media/pci/Kconfig | 18 ++------
drivers/media/pci/bt8xx/Kconfig | 1 -
drivers/media/platform/Kconfig | 7 ----
drivers/media/radio/Kconfig | 1 -
drivers/media/tuners/Kconfig | 8 ++--
drivers/media/usb/Kconfig | 29 ++++---------
drivers/media/usb/dvb-usb-v2/Kconfig | 2 +-
drivers/media/usb/em28xx/Kconfig | 4 +-
drivers/media/usb/go7007/Kconfig | 2 +-
sound/pci/Kconfig | 2 -
16 files changed, 20 insertions(+), 134 deletions(-)
Comments
Em Sat, 21 Mar 2020 03:41:27 -0300 Ezequiel Garcia <ezequiel@collabora.com> escreveu: > The Media subsystem has a set of configuration options > that control the visibility of other options, the > latter group associated to device driver enablement. > > In other words, it currently has two levels: > "support" options and "driver enablement" options. > > The "support" configuration options currently are: > > * Analog TV support > * Digital TV support > * Camera and grabbers support > * AM/FM radio support > * HDMI CEC support > * SDR support > > The "device driver enablement" options are: > > * USB devices > * PCI devices > * Platform-specific devices > * Memory-to-memory devices > * DVB devices > * CEC devices > * SDR devices > * ... > > In order to simplify the above, refactor the media configuration, > mostly by dropping the "support" options, which don't seem to > be really required. > > In other words, the following are removed: MEDIA_ANALOG_TV_SUPPORT, > MEDIA_DIGITAL_TV_SUPPORT, MEDIA_CAMERA_SUPPORT, MEDIA_RADIO_SUPPORT, > MEDIA_CEC_SUPPORT and MEDIA_SDR_SUPPORT. > > As a result, the configuration is now simplified. Users > will find USB capture devices under "Media USB Adapters", > or CEC adapters under "CEC platform devices", without > the need to enable any other "support" options. Nack. Those *_SUPPORT options were added to make life easier for users. There are too many things to be customized for a poor user to select the right options. So, from an end-user's perspective, what he really wants is: "let me enable my TV card" or: "I want to enable camera support" They usually don't know what driver supports it, nor what are the other drivers that should be enabled behind the scenes. Those options helps the users to reduce the amount of options for them to identify what they really bother, instead of presenting thousands of options they would need. Now, if you, instead, add some patch that would allow them to do something like: make board=<usb id> / make board=<pci id> Then this would be very welcomed. > > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > --- > drivers/media/Kconfig | 61 ---------------------------- > drivers/media/dvb-frontends/Kconfig | 2 +- > drivers/media/i2c/Kconfig | 14 +------ > drivers/media/i2c/m5mols/Kconfig | 1 - > drivers/media/i2c/smiapp/Kconfig | 1 - > drivers/media/mc/Kconfig | 1 - > drivers/media/pci/Kconfig | 18 ++------ > drivers/media/pci/bt8xx/Kconfig | 1 - > drivers/media/platform/Kconfig | 7 ---- > drivers/media/radio/Kconfig | 1 - > drivers/media/tuners/Kconfig | 8 ++-- > drivers/media/usb/Kconfig | 29 ++++--------- > drivers/media/usb/dvb-usb-v2/Kconfig | 2 +- > drivers/media/usb/em28xx/Kconfig | 4 +- > drivers/media/usb/go7007/Kconfig | 2 +- > sound/pci/Kconfig | 2 - > 16 files changed, 20 insertions(+), 134 deletions(-) > > diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig > index 9dfea5c4b6ab..fcbf265a92cd 100644 > --- a/drivers/media/Kconfig > +++ b/drivers/media/Kconfig > @@ -30,63 +30,6 @@ comment "Multimedia core support" > # > # Multimedia support - automatically enable V4L2 and DVB core > # > -config MEDIA_CAMERA_SUPPORT > - bool "Cameras/video grabbers support" > - help > - Enable support for webcams and video grabbers. > - > - Say Y when you have a webcam or a video capture grabber board. > - > -config MEDIA_ANALOG_TV_SUPPORT > - bool "Analog TV support" > - help > - Enable analog TV support. > - > - Say Y when you have a TV board with analog support or with a > - hybrid analog/digital TV chipset. > - > - Note: There are several DVB cards that are based on chips that > - support both analog and digital TV. Disabling this option > - will disable support for them. > - > -config MEDIA_DIGITAL_TV_SUPPORT > - bool "Digital TV support" > - help > - Enable digital TV support. > - > - Say Y when you have a board with digital support or a board with > - hybrid digital TV and analog TV. > - > -config MEDIA_RADIO_SUPPORT > - bool "AM/FM radio receivers/transmitters support" > - help > - Enable AM/FM radio support. > - > - Additional info and docs are available on the web at > - <https://linuxtv.org> > - > - Say Y when you have a board with radio support. > - > - Note: There are several TV cards that are based on chips that > - support radio reception. Disabling this option will > - disable support for them. > - > -config MEDIA_SDR_SUPPORT > - bool "Software defined radio support" > - help > - Enable software defined radio support. > - > - Say Y when you have a software defined radio device. > - > -config MEDIA_CEC_SUPPORT > - bool "HDMI CEC support" > - help > - Enable support for HDMI CEC (Consumer Electronics Control), > - which is an optional HDMI feature. > - > - Say Y when you have an HDMI receiver, transmitter or a USB CEC > - adapter that supports HDMI CEC. > - > source "drivers/media/cec/Kconfig" > > source "drivers/media/mc/Kconfig" > @@ -99,7 +42,6 @@ source "drivers/media/mc/Kconfig" > config VIDEO_DEV > tristate > depends on MEDIA_SUPPORT > - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > default y > > config VIDEO_V4L2_SUBDEV_API > @@ -121,7 +63,6 @@ source "drivers/media/v4l2-core/Kconfig" > config DVB_CORE > tristate > depends on MEDIA_SUPPORT > - depends on MEDIA_DIGITAL_TV_SUPPORT > depends on (I2C || I2C=n) > default y > select CRC32 > @@ -186,7 +127,6 @@ comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" > > config MEDIA_SUBDRV_AUTOSELECT > bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT > depends on HAS_IOMEM > select I2C > select I2C_MUX > @@ -214,7 +154,6 @@ config MEDIA_HIDE_ANCILLARY_SUBDRV > > config MEDIA_ATTACH > bool > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT > depends on MODULES > default MODULES > > diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig > index a29e9ddf9c82..832f66b91459 100644 > --- a/drivers/media/dvb-frontends/Kconfig > +++ b/drivers/media/dvb-frontends/Kconfig > @@ -518,7 +518,7 @@ config DVB_RTL2832 > > config DVB_RTL2832_SDR > tristate "Realtek RTL2832 SDR" > - depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && MEDIA_SDR_SUPPORT && USB > + depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && USB > select DVB_RTL2832 > select VIDEOBUF2_VMALLOC > default m if !MEDIA_SUBDRV_AUTOSELECT > diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig > index 125d596c13dd..92e51c288321 100644 > --- a/drivers/media/i2c/Kconfig > +++ b/drivers/media/i2c/Kconfig > @@ -568,8 +568,6 @@ config VIDEO_APTINA_PLL > config VIDEO_SMIAPP_PLL > tristate > > -if MEDIA_CAMERA_SUPPORT > - > config VIDEO_HI556 > tristate "Hynix Hi-556 sensor support" > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > @@ -1007,12 +1005,9 @@ config VIDEO_S5C73M3 > help > This is a V4L2 sensor driver for Samsung S5C73M3 > 8 Mpixel camera. > -endif > > comment "Lens drivers" > > -if MEDIA_CAMERA_SUPPORT > - > config VIDEO_AD5820 > tristate "AD5820 lens voice coil support" > depends on GPIOLIB && I2C && VIDEO_V4L2 && MEDIA_CONTROLLER > @@ -1050,12 +1045,8 @@ config VIDEO_DW9807_VCM > capability. This is designed for linear control of > voice coil motors, controlled via I2C serial interface. > > -endif > - > comment "Flash devices" > > -if MEDIA_CAMERA_SUPPORT > - > config VIDEO_ADP1653 > tristate "ADP1653 flash support" > depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER > @@ -1079,8 +1070,6 @@ config VIDEO_LM3646 > This is a driver for the lm3646 dual flash controllers. It controls > flash, torch LEDs. > > -endif > - > comment "Video improvement chips" > > config VIDEO_UPD64031A > @@ -1123,7 +1112,7 @@ comment "SDR tuner chips" > > config SDR_MAX2175 > tristate "Maxim 2175 RF to Bits tuner" > - depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C > + depends on VIDEO_V4L2 && I2C > select REGMAP_I2C > help > Support for Maxim 2175 tuner. It is an advanced analog/digital > @@ -1169,7 +1158,6 @@ config VIDEO_I2C > config VIDEO_ST_MIPID02 > tristate "STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge" > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > - depends on MEDIA_CAMERA_SUPPORT > select V4L2_FWNODE > help > Support for STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge. > diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kconfig > index e573482f269f..91c0dafc7668 100644 > --- a/drivers/media/i2c/m5mols/Kconfig > +++ b/drivers/media/i2c/m5mols/Kconfig > @@ -2,6 +2,5 @@ > config VIDEO_M5MOLS > tristate "Fujitsu M-5MOLS 8MP sensor support" > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > - depends on MEDIA_CAMERA_SUPPORT > help > This driver supports Fujitsu M-5MOLS camera sensor with ISP > diff --git a/drivers/media/i2c/smiapp/Kconfig b/drivers/media/i2c/smiapp/Kconfig > index fcaa7f9494a8..a2f5775dfcac 100644 > --- a/drivers/media/i2c/smiapp/Kconfig > +++ b/drivers/media/i2c/smiapp/Kconfig > @@ -2,7 +2,6 @@ > config VIDEO_SMIAPP > tristate "SMIA++/SMIA sensor support" > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK > - depends on MEDIA_CAMERA_SUPPORT > select VIDEO_SMIAPP_PLL > select V4L2_FWNODE > help > diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig > index 3b9795cfcb36..9382e35211ca 100644 > --- a/drivers/media/mc/Kconfig > +++ b/drivers/media/mc/Kconfig > @@ -5,7 +5,6 @@ > > config MEDIA_CONTROLLER > bool "Media Controller API" > - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > help > Enable the media controller API used to query media devices internal > topology and configure it dynamically. > diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig > index dcb3719f440e..3d2cc135acd6 100644 > --- a/drivers/media/pci/Kconfig > +++ b/drivers/media/pci/Kconfig > @@ -9,25 +9,20 @@ menuconfig MEDIA_PCI_SUPPORT > > if MEDIA_PCI_SUPPORT > > -if MEDIA_CAMERA_SUPPORT > - comment "Media capture support" > +comment "Media capture support" > source "drivers/media/pci/meye/Kconfig" > source "drivers/media/pci/solo6x10/Kconfig" > source "drivers/media/pci/sta2x11/Kconfig" > source "drivers/media/pci/tw5864/Kconfig" > source "drivers/media/pci/tw68/Kconfig" > source "drivers/media/pci/tw686x/Kconfig" > -endif > > -if MEDIA_ANALOG_TV_SUPPORT > - comment "Media capture/analog TV support" > +comment "Media capture/analog TV support" > source "drivers/media/pci/ivtv/Kconfig" > source "drivers/media/pci/saa7146/Kconfig" > source "drivers/media/pci/dt3155/Kconfig" > -endif > > -if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > - comment "Media capture/analog/hybrid TV support" > +comment "Media capture/analog/hybrid TV support" > source "drivers/media/pci/cx18/Kconfig" > source "drivers/media/pci/cx23885/Kconfig" > source "drivers/media/pci/cx25821/Kconfig" > @@ -37,10 +32,7 @@ source "drivers/media/pci/saa7134/Kconfig" > source "drivers/media/pci/saa7164/Kconfig" > source "drivers/media/pci/cobalt/Kconfig" > > -endif > - > -if MEDIA_DIGITAL_TV_SUPPORT > - comment "Media digital TV PCI Adapters" > +comment "Media digital TV PCI Adapters" > source "drivers/media/pci/ttpci/Kconfig" > source "drivers/media/pci/b2c2/Kconfig" > source "drivers/media/pci/pluto2/Kconfig" > @@ -52,8 +44,6 @@ source "drivers/media/pci/ngene/Kconfig" > source "drivers/media/pci/ddbridge/Kconfig" > source "drivers/media/pci/smipcie/Kconfig" > source "drivers/media/pci/netup_unidvb/Kconfig" > -endif > - > source "drivers/media/pci/intel/ipu3/Kconfig" > > endif #MEDIA_PCI_SUPPORT > diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig > index 75d172a6f54c..a4522c35d606 100644 > --- a/drivers/media/pci/bt8xx/Kconfig > +++ b/drivers/media/pci/bt8xx/Kconfig > @@ -5,7 +5,6 @@ config VIDEO_BT848 > select I2C_ALGOBIT > select VIDEOBUF_DMA_SG > depends on RC_CORE > - depends on MEDIA_RADIO_SUPPORT > select VIDEO_TUNER > select VIDEO_TVEEPROM > select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index e01bbb9dd1c1..6d48338e8100 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -5,7 +5,6 @@ > > menuconfig V4L_PLATFORM_DRIVERS > bool "V4L platform devices" > - depends on MEDIA_CAMERA_SUPPORT > help > Say Y here to enable support for platform-specific V4L drivers. > > @@ -43,7 +42,6 @@ config VIDEO_ASPEED > > config VIDEO_SH_VOU > tristate "SuperH VOU video output driver" > - depends on MEDIA_CAMERA_SUPPORT > depends on VIDEO_DEV && I2C > depends on ARCH_SHMOBILE || COMPILE_TEST > select VIDEOBUF2_DMA_CONTIG > @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS > menuconfig V4L_MEM2MEM_DRIVERS > bool "Memory-to-memory multimedia devices" > depends on VIDEO_V4L2 > - depends on MEDIA_CAMERA_SUPPORT > help > Say Y here to enable selecting drivers for V4L devices that > use system memory for both source and destination buffers, as opposed > @@ -534,7 +531,6 @@ config VIDEO_TI_CSC > > menuconfig V4L_TEST_DRIVERS > bool "Media test drivers" > - depends on MEDIA_CAMERA_SUPPORT > > if V4L_TEST_DRIVERS > > @@ -557,7 +553,6 @@ endif #V4L_TEST_DRIVERS > > menuconfig DVB_PLATFORM_DRIVERS > bool "DVB platform devices" > - depends on MEDIA_DIGITAL_TV_SUPPORT > help > Say Y here to enable support for platform-specific Digital TV drivers. > > @@ -567,7 +562,6 @@ endif #DVB_PLATFORM_DRIVERS > > menuconfig CEC_PLATFORM_DRIVERS > bool "CEC platform devices" > - depends on MEDIA_CEC_SUPPORT > > if CEC_PLATFORM_DRIVERS > > @@ -692,7 +686,6 @@ endif #CEC_PLATFORM_DRIVERS > > menuconfig SDR_PLATFORM_DRIVERS > bool "SDR platform devices" > - depends on MEDIA_SDR_SUPPORT > help > Say Y here to enable support for platform-specific SDR Drivers. > > diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig > index eb79d99787bd..e19ba6ab6e48 100644 > --- a/drivers/media/radio/Kconfig > +++ b/drivers/media/radio/Kconfig > @@ -6,7 +6,6 @@ > menuconfig RADIO_ADAPTERS > bool "Radio Adapters" > depends on VIDEO_V4L2 > - depends on MEDIA_RADIO_SUPPORT > default y > help > Say Y here to enable selecting AM/FM radio adapters. > diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig > index e104bb7766e1..7af7ff174eea 100644 > --- a/drivers/media/tuners/Kconfig > +++ b/drivers/media/tuners/Kconfig > @@ -2,26 +2,24 @@ > # Analog TV tuners, auto-loaded via tuner.ko > config MEDIA_TUNER > tristate > - depends on (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT) && I2C > + depends on I2C > default y > select MEDIA_TUNER_XC2028 if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_XC4000 if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_MT20XX if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT > - select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT > - select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT > + select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT > + select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT > > comment "Tuner drivers hidden by 'Autoselect ancillary drivers'" > depends on MEDIA_HIDE_ANCILLARY_SUBDRV > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > > menu "Customize TV tuners" > visible if !MEDIA_HIDE_ANCILLARY_SUBDRV > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > > config MEDIA_TUNER_SIMPLE > tristate "Simple tuner support" > diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig > index e678d3d11467..72c88b1add55 100644 > --- a/drivers/media/usb/Kconfig > +++ b/drivers/media/usb/Kconfig > @@ -9,8 +9,7 @@ menuconfig MEDIA_USB_SUPPORT > > if MEDIA_USB_SUPPORT > > -if MEDIA_CAMERA_SUPPORT > - comment "Webcam devices" > +comment "Webcam devices" > source "drivers/media/usb/uvc/Kconfig" > source "drivers/media/usb/gspca/Kconfig" > source "drivers/media/usb/pwc/Kconfig" > @@ -19,26 +18,19 @@ source "drivers/media/usb/zr364xx/Kconfig" > source "drivers/media/usb/stkwebcam/Kconfig" > source "drivers/media/usb/s2255/Kconfig" > source "drivers/media/usb/usbtv/Kconfig" > -endif > > -if MEDIA_ANALOG_TV_SUPPORT > - comment "Analog TV USB devices" > +comment "Analog TV USB devices" > source "drivers/media/usb/pvrusb2/Kconfig" > source "drivers/media/usb/hdpvr/Kconfig" > source "drivers/media/usb/stk1160/Kconfig" > source "drivers/media/usb/go7007/Kconfig" > -endif > > -if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) > - comment "Analog/digital TV USB devices" > +comment "Analog/digital TV USB devices" > source "drivers/media/usb/au0828/Kconfig" > source "drivers/media/usb/cx231xx/Kconfig" > source "drivers/media/usb/tm6000/Kconfig" > -endif > > - > -if I2C && MEDIA_DIGITAL_TV_SUPPORT > - comment "Digital TV USB devices" > +comment "Digital TV USB devices" > source "drivers/media/usb/dvb-usb/Kconfig" > source "drivers/media/usb/dvb-usb-v2/Kconfig" > source "drivers/media/usb/ttusb-budget/Kconfig" > @@ -46,25 +38,18 @@ source "drivers/media/usb/ttusb-dec/Kconfig" > source "drivers/media/usb/siano/Kconfig" > source "drivers/media/usb/b2c2/Kconfig" > source "drivers/media/usb/as102/Kconfig" > -endif > > -if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) > - comment "Webcam, TV (analog/digital) USB devices" > +comment "Webcam, TV (analog/digital) USB devices" > source "drivers/media/usb/em28xx/Kconfig" > -endif > > -if MEDIA_SDR_SUPPORT > - comment "Software defined radio USB devices" > +comment "Software defined radio USB devices" > source "drivers/media/usb/airspy/Kconfig" > source "drivers/media/usb/hackrf/Kconfig" > source "drivers/media/usb/msi2500/Kconfig" > -endif > > -if MEDIA_CEC_SUPPORT > - comment "USB HDMI CEC adapters" > +comment "USB HDMI CEC adapters" > source "drivers/media/usb/pulse8-cec/Kconfig" > source "drivers/media/usb/rainshadow-cec/Kconfig" > -endif > > endif #MEDIA_USB_SUPPORT > endif #USB > diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig > index b21a4d413872..8ebda4361b65 100644 > --- a/drivers/media/usb/dvb-usb-v2/Kconfig > +++ b/drivers/media/usb/dvb-usb-v2/Kconfig > @@ -137,7 +137,7 @@ config DVB_USB_RTL28XXU > select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT > select DVB_RTL2830 > select DVB_RTL2832 > - select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT) > + select DVB_RTL2832_SDR if MEDIA_SUBDRV_AUTOSELECT > select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_E4000 if MEDIA_SUBDRV_AUTOSELECT > select MEDIA_TUNER_FC0012 if MEDIA_SUBDRV_AUTOSELECT > diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig > index f2031a933e54..7031d6e80304 100644 > --- a/drivers/media/usb/em28xx/Kconfig > +++ b/drivers/media/usb/em28xx/Kconfig > @@ -12,8 +12,8 @@ config VIDEO_EM28XX_V4L2 > select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT > select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT > select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT > - select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > - select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > + select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT > + select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT > help > This is a video4linux driver for Empia 28xx based TV cards. > > diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig > index 4ff79940ad8d..533e95375082 100644 > --- a/drivers/media/usb/go7007/Kconfig > +++ b/drivers/media/usb/go7007/Kconfig > @@ -12,7 +12,7 @@ config VIDEO_GO7007 > select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT > select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT > select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT > - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT > select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT > help > This is a video4linux driver for the WIS GO7007 MPEG > diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig > index 93bc9bef7641..e68af4112505 100644 > --- a/sound/pci/Kconfig > +++ b/sound/pci/Kconfig > @@ -557,7 +557,6 @@ config SND_ES1968_INPUT > config SND_ES1968_RADIO > bool "Enable TEA5757 radio tuner support for es1968" > depends on SND_ES1968 > - depends on MEDIA_RADIO_SUPPORT > depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 > select RADIO_ADAPTERS > select RADIO_TEA575X > @@ -581,7 +580,6 @@ config SND_FM801 > config SND_FM801_TEA575X_BOOL > bool "ForteMedia FM801 + TEA5757 tuner" > depends on SND_FM801 > - depends on MEDIA_RADIO_SUPPORT > depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 > select RADIO_ADAPTERS > select RADIO_TEA575X Thanks, Mauro
Hello Mauro, Thanks for your prompt reply! On Sat, 2020-03-21 at 11:35 +0100, Mauro Carvalho Chehab wrote: > Em Sat, 21 Mar 2020 03:41:27 -0300 > Ezequiel Garcia <ezequiel@collabora.com> escreveu: > > > The Media subsystem has a set of configuration options > > that control the visibility of other options, the > > latter group associated to device driver enablement. > > > > In other words, it currently has two levels: > > "support" options and "driver enablement" options. > > > > The "support" configuration options currently are: > > > > * Analog TV support > > * Digital TV support > > * Camera and grabbers support > > * AM/FM radio support > > * HDMI CEC support > > * SDR support > > > > The "device driver enablement" options are: > > > > * USB devices > > * PCI devices > > * Platform-specific devices > > * Memory-to-memory devices > > * DVB devices > > * CEC devices > > * SDR devices > > * ... > > > > In order to simplify the above, refactor the media configuration, > > mostly by dropping the "support" options, which don't seem to > > be really required. > > > > In other words, the following are removed: MEDIA_ANALOG_TV_SUPPORT, > > MEDIA_DIGITAL_TV_SUPPORT, MEDIA_CAMERA_SUPPORT, MEDIA_RADIO_SUPPORT, > > MEDIA_CEC_SUPPORT and MEDIA_SDR_SUPPORT. > > > > As a result, the configuration is now simplified. Users > > will find USB capture devices under "Media USB Adapters", > > or CEC adapters under "CEC platform devices", without > > the need to enable any other "support" options. > > Nack. > Well, at least I got your attention on this topic :-) > Those *_SUPPORT options were added to make life easier for users. > There are too many things to be customized for a poor user to > select the right options. So, from an end-user's perspective, > what he really wants is: > Do you think end-user's configure their own kernel? I was under the assumption an end-user would use a distribution kernel. And distributions would take care of packaging what end-users need. > "let me enable my TV card > or: > "I want to enable camera support" > > They usually don't know what driver supports it, nor what are > the other drivers that should be enabled behind the scenes. > > Those options helps the users to reduce the amount of options > for them to identify what they really bother, instead of > presenting thousands of options they would need. > > Now, if you, instead, add some patch that would allow them > to do something like: > > make board=<usb id> / make board=<pci id> > > Then this would be very welcomed. > Hm, I see. So, another option is to clean memory-to-memory devices (codecs). There are no end-users for these devices, and they aren't really "Cameras/video grabbers". I am not sure why we've added them under CAMERA_SUPPORT. I'd love to get rid of at least that dependency. diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig index 3b9795cfcb36..9382e35211ca 100644 --- a/drivers/media/mc/Kconfig +++ b/drivers/media/mc/Kconfig @@ -5,7 +5,6 @@ config MEDIA_CONTROLLER bool "Media Controller API" - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT help Enable the media controller API used to query media devices internal topology and configure it dynamically. diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f65e98d3adf2..dc5869dac5dc 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -5,7 +5,6 @@ menuconfig V4L_PLATFORM_DRIVERS bool "V4L platform devices" - depends on MEDIA_CAMERA_SUPPORT help Say Y here to enable support for platform-specific V4L drivers. @@ -43,7 +42,6 @@ config VIDEO_ASPEED config VIDEO_SH_VOU tristate "SuperH VOU video output driver" - depends on MEDIA_CAMERA_SUPPORT depends on VIDEO_DEV && I2C depends on ARCH_SHMOBILE || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS menuconfig V4L_MEM2MEM_DRIVERS bool "Memory-to-memory multimedia devices" depends on VIDEO_V4L2 - depends on MEDIA_CAMERA_SUPPORT help Say Y here to enable selecting drivers for V4L devices that use system memory for both source and destination buffers, as opposed @@ -522,7 +519,6 @@ config VIDEO_TI_CSC menuconfig V4L_TEST_DRIVERS bool "Media test drivers" - depends on MEDIA_CAMERA_SUPPORT if V4L_TEST_DRIVERS Cheers, Ezequiel > > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > > --- > > drivers/media/Kconfig | 61 ---------------------------- > > drivers/media/dvb-frontends/Kconfig | 2 +- > > drivers/media/i2c/Kconfig | 14 +------ > > drivers/media/i2c/m5mols/Kconfig | 1 - > > drivers/media/i2c/smiapp/Kconfig | 1 - > > drivers/media/mc/Kconfig | 1 - > > drivers/media/pci/Kconfig | 18 ++------ > > drivers/media/pci/bt8xx/Kconfig | 1 - > > drivers/media/platform/Kconfig | 7 ---- > > drivers/media/radio/Kconfig | 1 - > > drivers/media/tuners/Kconfig | 8 ++-- > > drivers/media/usb/Kconfig | 29 ++++--------- > > drivers/media/usb/dvb-usb-v2/Kconfig | 2 +- > > drivers/media/usb/em28xx/Kconfig | 4 +- > > drivers/media/usb/go7007/Kconfig | 2 +- > > sound/pci/Kconfig | 2 - > > 16 files changed, 20 insertions(+), 134 deletions(-) > > > > diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig > > index 9dfea5c4b6ab..fcbf265a92cd 100644 > > --- a/drivers/media/Kconfig > > +++ b/drivers/media/Kconfig > > @@ -30,63 +30,6 @@ comment "Multimedia core support" > > # > > # Multimedia support - automatically enable V4L2 and DVB core > > # > > -config MEDIA_CAMERA_SUPPORT > > - bool "Cameras/video grabbers support" > > - help > > - Enable support for webcams and video grabbers. > > - > > - Say Y when you have a webcam or a video capture grabber board. > > - > > -config MEDIA_ANALOG_TV_SUPPORT > > - bool "Analog TV support" > > - help > > - Enable analog TV support. > > - > > - Say Y when you have a TV board with analog support or with a > > - hybrid analog/digital TV chipset. > > - > > - Note: There are several DVB cards that are based on chips that > > - support both analog and digital TV. Disabling this option > > - will disable support for them. > > - > > -config MEDIA_DIGITAL_TV_SUPPORT > > - bool "Digital TV support" > > - help > > - Enable digital TV support. > > - > > - Say Y when you have a board with digital support or a board with > > - hybrid digital TV and analog TV. > > - > > -config MEDIA_RADIO_SUPPORT > > - bool "AM/FM radio receivers/transmitters support" > > - help > > - Enable AM/FM radio support. > > - > > - Additional info and docs are available on the web at > > - <https://linuxtv.org> > > - > > - Say Y when you have a board with radio support. > > - > > - Note: There are several TV cards that are based on chips that > > - support radio reception. Disabling this option will > > - disable support for them. > > - > > -config MEDIA_SDR_SUPPORT > > - bool "Software defined radio support" > > - help > > - Enable software defined radio support. > > - > > - Say Y when you have a software defined radio device. > > - > > -config MEDIA_CEC_SUPPORT > > - bool "HDMI CEC support" > > - help > > - Enable support for HDMI CEC (Consumer Electronics Control), > > - which is an optional HDMI feature. > > - > > - Say Y when you have an HDMI receiver, transmitter or a USB CEC > > - adapter that supports HDMI CEC. > > - > > source "drivers/media/cec/Kconfig" > > > > source "drivers/media/mc/Kconfig" > > @@ -99,7 +42,6 @@ source "drivers/media/mc/Kconfig" > > config VIDEO_DEV > > tristate > > depends on MEDIA_SUPPORT > > - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > > default y > > > > config VIDEO_V4L2_SUBDEV_API > > @@ -121,7 +63,6 @@ source "drivers/media/v4l2-core/Kconfig" > > config DVB_CORE > > tristate > > depends on MEDIA_SUPPORT > > - depends on MEDIA_DIGITAL_TV_SUPPORT > > depends on (I2C || I2C=n) > > default y > > select CRC32 > > @@ -186,7 +127,6 @@ comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" > > > > config MEDIA_SUBDRV_AUTOSELECT > > bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" > > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT > > depends on HAS_IOMEM > > select I2C > > select I2C_MUX > > @@ -214,7 +154,6 @@ config MEDIA_HIDE_ANCILLARY_SUBDRV > > > > config MEDIA_ATTACH > > bool > > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT > > depends on MODULES > > default MODULES > > > > diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig > > index a29e9ddf9c82..832f66b91459 100644 > > --- a/drivers/media/dvb-frontends/Kconfig > > +++ b/drivers/media/dvb-frontends/Kconfig > > @@ -518,7 +518,7 @@ config DVB_RTL2832 > > > > config DVB_RTL2832_SDR > > tristate "Realtek RTL2832 SDR" > > - depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && MEDIA_SDR_SUPPORT && USB > > + depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && USB > > select DVB_RTL2832 > > select VIDEOBUF2_VMALLOC > > default m if !MEDIA_SUBDRV_AUTOSELECT > > diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig > > index 125d596c13dd..92e51c288321 100644 > > --- a/drivers/media/i2c/Kconfig > > +++ b/drivers/media/i2c/Kconfig > > @@ -568,8 +568,6 @@ config VIDEO_APTINA_PLL > > config VIDEO_SMIAPP_PLL > > tristate > > > > -if MEDIA_CAMERA_SUPPORT > > - > > config VIDEO_HI556 > > tristate "Hynix Hi-556 sensor support" > > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > > @@ -1007,12 +1005,9 @@ config VIDEO_S5C73M3 > > help > > This is a V4L2 sensor driver for Samsung S5C73M3 > > 8 Mpixel camera. > > -endif > > > > comment "Lens drivers" > > > > -if MEDIA_CAMERA_SUPPORT > > - > > config VIDEO_AD5820 > > tristate "AD5820 lens voice coil support" > > depends on GPIOLIB && I2C && VIDEO_V4L2 && MEDIA_CONTROLLER > > @@ -1050,12 +1045,8 @@ config VIDEO_DW9807_VCM > > capability. This is designed for linear control of > > voice coil motors, controlled via I2C serial interface. > > > > -endif > > - > > comment "Flash devices" > > > > -if MEDIA_CAMERA_SUPPORT > > - > > config VIDEO_ADP1653 > > tristate "ADP1653 flash support" > > depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER > > @@ -1079,8 +1070,6 @@ config VIDEO_LM3646 > > This is a driver for the lm3646 dual flash controllers. It controls > > flash, torch LEDs. > > > > -endif > > - > > comment "Video improvement chips" > > > > config VIDEO_UPD64031A > > @@ -1123,7 +1112,7 @@ comment "SDR tuner chips" > > > > config SDR_MAX2175 > > tristate "Maxim 2175 RF to Bits tuner" > > - depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C > > + depends on VIDEO_V4L2 && I2C > > select REGMAP_I2C > > help > > Support for Maxim 2175 tuner. It is an advanced analog/digital > > @@ -1169,7 +1158,6 @@ config VIDEO_I2C > > config VIDEO_ST_MIPID02 > > tristate "STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge" > > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > > - depends on MEDIA_CAMERA_SUPPORT > > select V4L2_FWNODE > > help > > Support for STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge. > > diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kconfig > > index e573482f269f..91c0dafc7668 100644 > > --- a/drivers/media/i2c/m5mols/Kconfig > > +++ b/drivers/media/i2c/m5mols/Kconfig > > @@ -2,6 +2,5 @@ > > config VIDEO_M5MOLS > > tristate "Fujitsu M-5MOLS 8MP sensor support" > > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > > - depends on MEDIA_CAMERA_SUPPORT > > help > > This driver supports Fujitsu M-5MOLS camera sensor with ISP > > diff --git a/drivers/media/i2c/smiapp/Kconfig b/drivers/media/i2c/smiapp/Kconfig > > index fcaa7f9494a8..a2f5775dfcac 100644 > > --- a/drivers/media/i2c/smiapp/Kconfig > > +++ b/drivers/media/i2c/smiapp/Kconfig > > @@ -2,7 +2,6 @@ > > config VIDEO_SMIAPP > > tristate "SMIA++/SMIA sensor support" > > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK > > - depends on MEDIA_CAMERA_SUPPORT > > select VIDEO_SMIAPP_PLL > > select V4L2_FWNODE > > help > > diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig > > index 3b9795cfcb36..9382e35211ca 100644 > > --- a/drivers/media/mc/Kconfig > > +++ b/drivers/media/mc/Kconfig > > @@ -5,7 +5,6 @@ > > > > config MEDIA_CONTROLLER > > bool "Media Controller API" > > - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > > help > > Enable the media controller API used to query media devices internal > > topology and configure it dynamically. > > diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig > > index dcb3719f440e..3d2cc135acd6 100644 > > --- a/drivers/media/pci/Kconfig > > +++ b/drivers/media/pci/Kconfig > > @@ -9,25 +9,20 @@ menuconfig MEDIA_PCI_SUPPORT > > > > if MEDIA_PCI_SUPPORT > > > > -if MEDIA_CAMERA_SUPPORT > > - comment "Media capture support" > > +comment "Media capture support" > > source "drivers/media/pci/meye/Kconfig" > > source "drivers/media/pci/solo6x10/Kconfig" > > source "drivers/media/pci/sta2x11/Kconfig" > > source "drivers/media/pci/tw5864/Kconfig" > > source "drivers/media/pci/tw68/Kconfig" > > source "drivers/media/pci/tw686x/Kconfig" > > -endif > > > > -if MEDIA_ANALOG_TV_SUPPORT > > - comment "Media capture/analog TV support" > > +comment "Media capture/analog TV support" > > source "drivers/media/pci/ivtv/Kconfig" > > source "drivers/media/pci/saa7146/Kconfig" > > source "drivers/media/pci/dt3155/Kconfig" > > -endif > > > > -if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > > - comment "Media capture/analog/hybrid TV support" > > +comment "Media capture/analog/hybrid TV support" > > source "drivers/media/pci/cx18/Kconfig" > > source "drivers/media/pci/cx23885/Kconfig" > > source "drivers/media/pci/cx25821/Kconfig" > > @@ -37,10 +32,7 @@ source "drivers/media/pci/saa7134/Kconfig" > > source "drivers/media/pci/saa7164/Kconfig" > > source "drivers/media/pci/cobalt/Kconfig" > > > > -endif > > - > > -if MEDIA_DIGITAL_TV_SUPPORT > > - comment "Media digital TV PCI Adapters" > > +comment "Media digital TV PCI Adapters" > > source "drivers/media/pci/ttpci/Kconfig" > > source "drivers/media/pci/b2c2/Kconfig" > > source "drivers/media/pci/pluto2/Kconfig" > > @@ -52,8 +44,6 @@ source "drivers/media/pci/ngene/Kconfig" > > source "drivers/media/pci/ddbridge/Kconfig" > > source "drivers/media/pci/smipcie/Kconfig" > > source "drivers/media/pci/netup_unidvb/Kconfig" > > -endif > > - > > source "drivers/media/pci/intel/ipu3/Kconfig" > > > > endif #MEDIA_PCI_SUPPORT > > diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig > > index 75d172a6f54c..a4522c35d606 100644 > > --- a/drivers/media/pci/bt8xx/Kconfig > > +++ b/drivers/media/pci/bt8xx/Kconfig > > @@ -5,7 +5,6 @@ config VIDEO_BT848 > > select I2C_ALGOBIT > > select VIDEOBUF_DMA_SG > > depends on RC_CORE > > - depends on MEDIA_RADIO_SUPPORT > > select VIDEO_TUNER > > select VIDEO_TVEEPROM > > select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > > index e01bbb9dd1c1..6d48338e8100 100644 > > --- a/drivers/media/platform/Kconfig > > +++ b/drivers/media/platform/Kconfig > > @@ -5,7 +5,6 @@ > > > > menuconfig V4L_PLATFORM_DRIVERS > > bool "V4L platform devices" > > - depends on MEDIA_CAMERA_SUPPORT > > help > > Say Y here to enable support for platform-specific V4L drivers. > > > > @@ -43,7 +42,6 @@ config VIDEO_ASPEED > > > > config VIDEO_SH_VOU > > tristate "SuperH VOU video output driver" > > - depends on MEDIA_CAMERA_SUPPORT > > depends on VIDEO_DEV && I2C > > depends on ARCH_SHMOBILE || COMPILE_TEST > > select VIDEOBUF2_DMA_CONTIG > > @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS > > menuconfig V4L_MEM2MEM_DRIVERS > > bool "Memory-to-memory multimedia devices" > > depends on VIDEO_V4L2 > > - depends on MEDIA_CAMERA_SUPPORT > > help > > Say Y here to enable selecting drivers for V4L devices that > > use system memory for both source and destination buffers, as opposed > > @@ -534,7 +531,6 @@ config VIDEO_TI_CSC > > > > menuconfig V4L_TEST_DRIVERS > > bool "Media test drivers" > > - depends on MEDIA_CAMERA_SUPPORT > > > > if V4L_TEST_DRIVERS > > > > @@ -557,7 +553,6 @@ endif #V4L_TEST_DRIVERS > > > > menuconfig DVB_PLATFORM_DRIVERS > > bool "DVB platform devices" > > - depends on MEDIA_DIGITAL_TV_SUPPORT > > help > > Say Y here to enable support for platform-specific Digital TV drivers. > > > > @@ -567,7 +562,6 @@ endif #DVB_PLATFORM_DRIVERS > > > > menuconfig CEC_PLATFORM_DRIVERS > > bool "CEC platform devices" > > - depends on MEDIA_CEC_SUPPORT > > > > if CEC_PLATFORM_DRIVERS > > > > @@ -692,7 +686,6 @@ endif #CEC_PLATFORM_DRIVERS > > > > menuconfig SDR_PLATFORM_DRIVERS > > bool "SDR platform devices" > > - depends on MEDIA_SDR_SUPPORT > > help > > Say Y here to enable support for platform-specific SDR Drivers. > > > > diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig > > index eb79d99787bd..e19ba6ab6e48 100644 > > --- a/drivers/media/radio/Kconfig > > +++ b/drivers/media/radio/Kconfig > > @@ -6,7 +6,6 @@ > > menuconfig RADIO_ADAPTERS > > bool "Radio Adapters" > > depends on VIDEO_V4L2 > > - depends on MEDIA_RADIO_SUPPORT > > default y > > help > > Say Y here to enable selecting AM/FM radio adapters. > > diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig > > index e104bb7766e1..7af7ff174eea 100644 > > --- a/drivers/media/tuners/Kconfig > > +++ b/drivers/media/tuners/Kconfig > > @@ -2,26 +2,24 @@ > > # Analog TV tuners, auto-loaded via tuner.ko > > config MEDIA_TUNER > > tristate > > - depends on (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT) && I2C > > + depends on I2C > > default y > > select MEDIA_TUNER_XC2028 if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_XC4000 if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_MT20XX if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT > > - select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT > > - select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT > > + select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT > > + select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT > > > > comment "Tuner drivers hidden by 'Autoselect ancillary drivers'" > > depends on MEDIA_HIDE_ANCILLARY_SUBDRV > > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > > > > menu "Customize TV tuners" > > visible if !MEDIA_HIDE_ANCILLARY_SUBDRV > > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > > > > config MEDIA_TUNER_SIMPLE > > tristate "Simple tuner support" > > diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig > > index e678d3d11467..72c88b1add55 100644 > > --- a/drivers/media/usb/Kconfig > > +++ b/drivers/media/usb/Kconfig > > @@ -9,8 +9,7 @@ menuconfig MEDIA_USB_SUPPORT > > > > if MEDIA_USB_SUPPORT > > > > -if MEDIA_CAMERA_SUPPORT > > - comment "Webcam devices" > > +comment "Webcam devices" > > source "drivers/media/usb/uvc/Kconfig" > > source "drivers/media/usb/gspca/Kconfig" > > source "drivers/media/usb/pwc/Kconfig" > > @@ -19,26 +18,19 @@ source "drivers/media/usb/zr364xx/Kconfig" > > source "drivers/media/usb/stkwebcam/Kconfig" > > source "drivers/media/usb/s2255/Kconfig" > > source "drivers/media/usb/usbtv/Kconfig" > > -endif > > > > -if MEDIA_ANALOG_TV_SUPPORT > > - comment "Analog TV USB devices" > > +comment "Analog TV USB devices" > > source "drivers/media/usb/pvrusb2/Kconfig" > > source "drivers/media/usb/hdpvr/Kconfig" > > source "drivers/media/usb/stk1160/Kconfig" > > source "drivers/media/usb/go7007/Kconfig" > > -endif > > > > -if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) > > - comment "Analog/digital TV USB devices" > > +comment "Analog/digital TV USB devices" > > source "drivers/media/usb/au0828/Kconfig" > > source "drivers/media/usb/cx231xx/Kconfig" > > source "drivers/media/usb/tm6000/Kconfig" > > -endif > > > > - > > -if I2C && MEDIA_DIGITAL_TV_SUPPORT > > - comment "Digital TV USB devices" > > +comment "Digital TV USB devices" > > source "drivers/media/usb/dvb-usb/Kconfig" > > source "drivers/media/usb/dvb-usb-v2/Kconfig" > > source "drivers/media/usb/ttusb-budget/Kconfig" > > @@ -46,25 +38,18 @@ source "drivers/media/usb/ttusb-dec/Kconfig" > > source "drivers/media/usb/siano/Kconfig" > > source "drivers/media/usb/b2c2/Kconfig" > > source "drivers/media/usb/as102/Kconfig" > > -endif > > > > -if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) > > - comment "Webcam, TV (analog/digital) USB devices" > > +comment "Webcam, TV (analog/digital) USB devices" > > source "drivers/media/usb/em28xx/Kconfig" > > -endif > > > > -if MEDIA_SDR_SUPPORT > > - comment "Software defined radio USB devices" > > +comment "Software defined radio USB devices" > > source "drivers/media/usb/airspy/Kconfig" > > source "drivers/media/usb/hackrf/Kconfig" > > source "drivers/media/usb/msi2500/Kconfig" > > -endif > > > > -if MEDIA_CEC_SUPPORT > > - comment "USB HDMI CEC adapters" > > +comment "USB HDMI CEC adapters" > > source "drivers/media/usb/pulse8-cec/Kconfig" > > source "drivers/media/usb/rainshadow-cec/Kconfig" > > -endif > > > > endif #MEDIA_USB_SUPPORT > > endif #USB > > diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig > > index b21a4d413872..8ebda4361b65 100644 > > --- a/drivers/media/usb/dvb-usb-v2/Kconfig > > +++ b/drivers/media/usb/dvb-usb-v2/Kconfig > > @@ -137,7 +137,7 @@ config DVB_USB_RTL28XXU > > select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT > > select DVB_RTL2830 > > select DVB_RTL2832 > > - select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT) > > + select DVB_RTL2832_SDR if MEDIA_SUBDRV_AUTOSELECT > > select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_E4000 if MEDIA_SUBDRV_AUTOSELECT > > select MEDIA_TUNER_FC0012 if MEDIA_SUBDRV_AUTOSELECT > > diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig > > index f2031a933e54..7031d6e80304 100644 > > --- a/drivers/media/usb/em28xx/Kconfig > > +++ b/drivers/media/usb/em28xx/Kconfig > > @@ -12,8 +12,8 @@ config VIDEO_EM28XX_V4L2 > > select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT > > select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT > > select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT > > - select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > > - select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > > + select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT > > + select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT > > help > > This is a video4linux driver for Empia 28xx based TV cards. > > > > diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig > > index 4ff79940ad8d..533e95375082 100644 > > --- a/drivers/media/usb/go7007/Kconfig > > +++ b/drivers/media/usb/go7007/Kconfig > > @@ -12,7 +12,7 @@ config VIDEO_GO7007 > > select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT > > select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT > > select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT > > - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > > + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT > > select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT > > help > > This is a video4linux driver for the WIS GO7007 MPEG > > diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig > > index 93bc9bef7641..e68af4112505 100644 > > --- a/sound/pci/Kconfig > > +++ b/sound/pci/Kconfig > > @@ -557,7 +557,6 @@ config SND_ES1968_INPUT > > config SND_ES1968_RADIO > > bool "Enable TEA5757 radio tuner support for es1968" > > depends on SND_ES1968 > > - depends on MEDIA_RADIO_SUPPORT > > depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 > > select RADIO_ADAPTERS > > select RADIO_TEA575X > > @@ -581,7 +580,6 @@ config SND_FM801 > > config SND_FM801_TEA575X_BOOL > > bool "ForteMedia FM801 + TEA5757 tuner" > > depends on SND_FM801 > > - depends on MEDIA_RADIO_SUPPORT > > depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 > > select RADIO_ADAPTERS > > select RADIO_TEA575X > > > Thanks, > Mauro
Em Sat, 21 Mar 2020 09:39:02 -0300 Ezequiel Garcia <ezequiel@collabora.com> escreveu: > > > In other words, the following are removed: MEDIA_ANALOG_TV_SUPPORT, > > > MEDIA_DIGITAL_TV_SUPPORT, MEDIA_CAMERA_SUPPORT, MEDIA_RADIO_SUPPORT, > > > MEDIA_CEC_SUPPORT and MEDIA_SDR_SUPPORT. > > > > > > As a result, the configuration is now simplified. Users > > > will find USB capture devices under "Media USB Adapters", > > > or CEC adapters under "CEC platform devices", without > > > the need to enable any other "support" options. > > > > Nack. > > > > Well, at least I got your attention on this topic :-) :-) > > > Those *_SUPPORT options were added to make life easier for users. > > There are too many things to be customized for a poor user to > > select the right options. So, from an end-user's perspective, > > what he really wants is: > > > > Do you think end-user's configure their own kernel? They actually do, either directly or via media-build tree. > I was under the assumption an end-user would use > a distribution kernel. And distributions would take care > of packaging what end-users need. > > > "let me enable my TV card > > or: > > "I want to enable camera support" > > > > They usually don't know what driver supports it, nor what are > > the other drivers that should be enabled behind the scenes. > > > > Those options helps the users to reduce the amount of options > > for them to identify what they really bother, instead of > > presenting thousands of options they would need. > > > > Now, if you, instead, add some patch that would allow them > > to do something like: > > > > make board=<usb id> / make board=<pci id> > > > > Then this would be very welcomed. > > > > Hm, I see. > > So, another option is to clean memory-to-memory devices > (codecs). There are no end-users for these devices, > and they aren't really "Cameras/video grabbers". > > I am not sure why we've added them under CAMERA_SUPPORT. > I'd love to get rid of at least that dependency. Good question. Probably because people just re-used what it was there without thinking too much. I remember someone once proposed adding an option to add a "MEDIA_EMBEDDED" (or some other name) that would just allow setting everything as if those other *SUPORT koptions didn't exist. something like this would do the trick: CONFIG_MEDIA_EMBEDDED bool config MEDIA_CAMERA_SUPPORT visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT default y if CONFIG_MEDIA_EMBEDDED_SUPPORT config MEDIA_ANALOG_TV_SUPPORT visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT default y if CONFIG_MEDIA_EMBEDDED_SUPPORT config MEDIA_DIGITAL_TV_SUPPORT visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT default y if CONFIG_MEDIA_EMBEDDED_SUPPORT config MEDIA_RADIO_SUPPORT visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT default y if CONFIG_MEDIA_EMBEDDED_SUPPORT Regards, Mauro > > diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig > index 3b9795cfcb36..9382e35211ca 100644 > --- a/drivers/media/mc/Kconfig > +++ b/drivers/media/mc/Kconfig > @@ -5,7 +5,6 @@ > > config MEDIA_CONTROLLER > bool "Media Controller API" > - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > help > Enable the media controller API used to query media devices internal > topology and configure it dynamically. > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index f65e98d3adf2..dc5869dac5dc 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -5,7 +5,6 @@ > > menuconfig V4L_PLATFORM_DRIVERS > bool "V4L platform devices" > - depends on MEDIA_CAMERA_SUPPORT > help > Say Y here to enable support for platform-specific V4L drivers. > > @@ -43,7 +42,6 @@ config VIDEO_ASPEED > > config VIDEO_SH_VOU > tristate "SuperH VOU video output driver" > - depends on MEDIA_CAMERA_SUPPORT > depends on VIDEO_DEV && I2C > depends on ARCH_SHMOBILE || COMPILE_TEST > select VIDEOBUF2_DMA_CONTIG > @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS > menuconfig V4L_MEM2MEM_DRIVERS > bool "Memory-to-memory multimedia devices" > depends on VIDEO_V4L2 > - depends on MEDIA_CAMERA_SUPPORT > help > Say Y here to enable selecting drivers for V4L devices that > use system memory for both source and destination buffers, as opposed > @@ -522,7 +519,6 @@ config VIDEO_TI_CSC > > menuconfig V4L_TEST_DRIVERS > bool "Media test drivers" > - depends on MEDIA_CAMERA_SUPPORT > > if V4L_TEST_DRIVERS > > > Cheers, > Ezequiel > > > > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > > > --- > > > drivers/media/Kconfig | 61 ---------------------------- > > > drivers/media/dvb-frontends/Kconfig | 2 +- > > > drivers/media/i2c/Kconfig | 14 +------ > > > drivers/media/i2c/m5mols/Kconfig | 1 - > > > drivers/media/i2c/smiapp/Kconfig | 1 - > > > drivers/media/mc/Kconfig | 1 - > > > drivers/media/pci/Kconfig | 18 ++------ > > > drivers/media/pci/bt8xx/Kconfig | 1 - > > > drivers/media/platform/Kconfig | 7 ---- > > > drivers/media/radio/Kconfig | 1 - > > > drivers/media/tuners/Kconfig | 8 ++-- > > > drivers/media/usb/Kconfig | 29 ++++--------- > > > drivers/media/usb/dvb-usb-v2/Kconfig | 2 +- > > > drivers/media/usb/em28xx/Kconfig | 4 +- > > > drivers/media/usb/go7007/Kconfig | 2 +- > > > sound/pci/Kconfig | 2 - > > > 16 files changed, 20 insertions(+), 134 deletions(-) > > > > > > diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig > > > index 9dfea5c4b6ab..fcbf265a92cd 100644 > > > --- a/drivers/media/Kconfig > > > +++ b/drivers/media/Kconfig > > > @@ -30,63 +30,6 @@ comment "Multimedia core support" > > > # > > > # Multimedia support - automatically enable V4L2 and DVB core > > > # > > > -config MEDIA_CAMERA_SUPPORT > > > - bool "Cameras/video grabbers support" > > > - help > > > - Enable support for webcams and video grabbers. > > > - > > > - Say Y when you have a webcam or a video capture grabber board. > > > - > > > -config MEDIA_ANALOG_TV_SUPPORT > > > - bool "Analog TV support" > > > - help > > > - Enable analog TV support. > > > - > > > - Say Y when you have a TV board with analog support or with a > > > - hybrid analog/digital TV chipset. > > > - > > > - Note: There are several DVB cards that are based on chips that > > > - support both analog and digital TV. Disabling this option > > > - will disable support for them. > > > - > > > -config MEDIA_DIGITAL_TV_SUPPORT > > > - bool "Digital TV support" > > > - help > > > - Enable digital TV support. > > > - > > > - Say Y when you have a board with digital support or a board with > > > - hybrid digital TV and analog TV. > > > - > > > -config MEDIA_RADIO_SUPPORT > > > - bool "AM/FM radio receivers/transmitters support" > > > - help > > > - Enable AM/FM radio support. > > > - > > > - Additional info and docs are available on the web at > > > - <https://linuxtv.org> > > > - > > > - Say Y when you have a board with radio support. > > > - > > > - Note: There are several TV cards that are based on chips that > > > - support radio reception. Disabling this option will > > > - disable support for them. > > > - > > > -config MEDIA_SDR_SUPPORT > > > - bool "Software defined radio support" > > > - help > > > - Enable software defined radio support. > > > - > > > - Say Y when you have a software defined radio device. > > > - > > > -config MEDIA_CEC_SUPPORT > > > - bool "HDMI CEC support" > > > - help > > > - Enable support for HDMI CEC (Consumer Electronics Control), > > > - which is an optional HDMI feature. > > > - > > > - Say Y when you have an HDMI receiver, transmitter or a USB CEC > > > - adapter that supports HDMI CEC. > > > - > > > source "drivers/media/cec/Kconfig" > > > > > > source "drivers/media/mc/Kconfig" > > > @@ -99,7 +42,6 @@ source "drivers/media/mc/Kconfig" > > > config VIDEO_DEV > > > tristate > > > depends on MEDIA_SUPPORT > > > - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > > > default y > > > > > > config VIDEO_V4L2_SUBDEV_API > > > @@ -121,7 +63,6 @@ source "drivers/media/v4l2-core/Kconfig" > > > config DVB_CORE > > > tristate > > > depends on MEDIA_SUPPORT > > > - depends on MEDIA_DIGITAL_TV_SUPPORT > > > depends on (I2C || I2C=n) > > > default y > > > select CRC32 > > > @@ -186,7 +127,6 @@ comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" > > > > > > config MEDIA_SUBDRV_AUTOSELECT > > > bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" > > > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT > > > depends on HAS_IOMEM > > > select I2C > > > select I2C_MUX > > > @@ -214,7 +154,6 @@ config MEDIA_HIDE_ANCILLARY_SUBDRV > > > > > > config MEDIA_ATTACH > > > bool > > > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT > > > depends on MODULES > > > default MODULES > > > > > > diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig > > > index a29e9ddf9c82..832f66b91459 100644 > > > --- a/drivers/media/dvb-frontends/Kconfig > > > +++ b/drivers/media/dvb-frontends/Kconfig > > > @@ -518,7 +518,7 @@ config DVB_RTL2832 > > > > > > config DVB_RTL2832_SDR > > > tristate "Realtek RTL2832 SDR" > > > - depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && MEDIA_SDR_SUPPORT && USB > > > + depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && USB > > > select DVB_RTL2832 > > > select VIDEOBUF2_VMALLOC > > > default m if !MEDIA_SUBDRV_AUTOSELECT > > > diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig > > > index 125d596c13dd..92e51c288321 100644 > > > --- a/drivers/media/i2c/Kconfig > > > +++ b/drivers/media/i2c/Kconfig > > > @@ -568,8 +568,6 @@ config VIDEO_APTINA_PLL > > > config VIDEO_SMIAPP_PLL > > > tristate > > > > > > -if MEDIA_CAMERA_SUPPORT > > > - > > > config VIDEO_HI556 > > > tristate "Hynix Hi-556 sensor support" > > > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > > > @@ -1007,12 +1005,9 @@ config VIDEO_S5C73M3 > > > help > > > This is a V4L2 sensor driver for Samsung S5C73M3 > > > 8 Mpixel camera. > > > -endif > > > > > > comment "Lens drivers" > > > > > > -if MEDIA_CAMERA_SUPPORT > > > - > > > config VIDEO_AD5820 > > > tristate "AD5820 lens voice coil support" > > > depends on GPIOLIB && I2C && VIDEO_V4L2 && MEDIA_CONTROLLER > > > @@ -1050,12 +1045,8 @@ config VIDEO_DW9807_VCM > > > capability. This is designed for linear control of > > > voice coil motors, controlled via I2C serial interface. > > > > > > -endif > > > - > > > comment "Flash devices" > > > > > > -if MEDIA_CAMERA_SUPPORT > > > - > > > config VIDEO_ADP1653 > > > tristate "ADP1653 flash support" > > > depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER > > > @@ -1079,8 +1070,6 @@ config VIDEO_LM3646 > > > This is a driver for the lm3646 dual flash controllers. It controls > > > flash, torch LEDs. > > > > > > -endif > > > - > > > comment "Video improvement chips" > > > > > > config VIDEO_UPD64031A > > > @@ -1123,7 +1112,7 @@ comment "SDR tuner chips" > > > > > > config SDR_MAX2175 > > > tristate "Maxim 2175 RF to Bits tuner" > > > - depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C > > > + depends on VIDEO_V4L2 && I2C > > > select REGMAP_I2C > > > help > > > Support for Maxim 2175 tuner. It is an advanced analog/digital > > > @@ -1169,7 +1158,6 @@ config VIDEO_I2C > > > config VIDEO_ST_MIPID02 > > > tristate "STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge" > > > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > > > - depends on MEDIA_CAMERA_SUPPORT > > > select V4L2_FWNODE > > > help > > > Support for STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge. > > > diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kconfig > > > index e573482f269f..91c0dafc7668 100644 > > > --- a/drivers/media/i2c/m5mols/Kconfig > > > +++ b/drivers/media/i2c/m5mols/Kconfig > > > @@ -2,6 +2,5 @@ > > > config VIDEO_M5MOLS > > > tristate "Fujitsu M-5MOLS 8MP sensor support" > > > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > > > - depends on MEDIA_CAMERA_SUPPORT > > > help > > > This driver supports Fujitsu M-5MOLS camera sensor with ISP > > > diff --git a/drivers/media/i2c/smiapp/Kconfig b/drivers/media/i2c/smiapp/Kconfig > > > index fcaa7f9494a8..a2f5775dfcac 100644 > > > --- a/drivers/media/i2c/smiapp/Kconfig > > > +++ b/drivers/media/i2c/smiapp/Kconfig > > > @@ -2,7 +2,6 @@ > > > config VIDEO_SMIAPP > > > tristate "SMIA++/SMIA sensor support" > > > depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK > > > - depends on MEDIA_CAMERA_SUPPORT > > > select VIDEO_SMIAPP_PLL > > > select V4L2_FWNODE > > > help > > > diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig > > > index 3b9795cfcb36..9382e35211ca 100644 > > > --- a/drivers/media/mc/Kconfig > > > +++ b/drivers/media/mc/Kconfig > > > @@ -5,7 +5,6 @@ > > > > > > config MEDIA_CONTROLLER > > > bool "Media Controller API" > > > - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > > > help > > > Enable the media controller API used to query media devices internal > > > topology and configure it dynamically. > > > diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig > > > index dcb3719f440e..3d2cc135acd6 100644 > > > --- a/drivers/media/pci/Kconfig > > > +++ b/drivers/media/pci/Kconfig > > > @@ -9,25 +9,20 @@ menuconfig MEDIA_PCI_SUPPORT > > > > > > if MEDIA_PCI_SUPPORT > > > > > > -if MEDIA_CAMERA_SUPPORT > > > - comment "Media capture support" > > > +comment "Media capture support" > > > source "drivers/media/pci/meye/Kconfig" > > > source "drivers/media/pci/solo6x10/Kconfig" > > > source "drivers/media/pci/sta2x11/Kconfig" > > > source "drivers/media/pci/tw5864/Kconfig" > > > source "drivers/media/pci/tw68/Kconfig" > > > source "drivers/media/pci/tw686x/Kconfig" > > > -endif > > > > > > -if MEDIA_ANALOG_TV_SUPPORT > > > - comment "Media capture/analog TV support" > > > +comment "Media capture/analog TV support" > > > source "drivers/media/pci/ivtv/Kconfig" > > > source "drivers/media/pci/saa7146/Kconfig" > > > source "drivers/media/pci/dt3155/Kconfig" > > > -endif > > > > > > -if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > > > - comment "Media capture/analog/hybrid TV support" > > > +comment "Media capture/analog/hybrid TV support" > > > source "drivers/media/pci/cx18/Kconfig" > > > source "drivers/media/pci/cx23885/Kconfig" > > > source "drivers/media/pci/cx25821/Kconfig" > > > @@ -37,10 +32,7 @@ source "drivers/media/pci/saa7134/Kconfig" > > > source "drivers/media/pci/saa7164/Kconfig" > > > source "drivers/media/pci/cobalt/Kconfig" > > > > > > -endif > > > - > > > -if MEDIA_DIGITAL_TV_SUPPORT > > > - comment "Media digital TV PCI Adapters" > > > +comment "Media digital TV PCI Adapters" > > > source "drivers/media/pci/ttpci/Kconfig" > > > source "drivers/media/pci/b2c2/Kconfig" > > > source "drivers/media/pci/pluto2/Kconfig" > > > @@ -52,8 +44,6 @@ source "drivers/media/pci/ngene/Kconfig" > > > source "drivers/media/pci/ddbridge/Kconfig" > > > source "drivers/media/pci/smipcie/Kconfig" > > > source "drivers/media/pci/netup_unidvb/Kconfig" > > > -endif > > > - > > > source "drivers/media/pci/intel/ipu3/Kconfig" > > > > > > endif #MEDIA_PCI_SUPPORT > > > diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig > > > index 75d172a6f54c..a4522c35d606 100644 > > > --- a/drivers/media/pci/bt8xx/Kconfig > > > +++ b/drivers/media/pci/bt8xx/Kconfig > > > @@ -5,7 +5,6 @@ config VIDEO_BT848 > > > select I2C_ALGOBIT > > > select VIDEOBUF_DMA_SG > > > depends on RC_CORE > > > - depends on MEDIA_RADIO_SUPPORT > > > select VIDEO_TUNER > > > select VIDEO_TVEEPROM > > > select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT > > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > > > index e01bbb9dd1c1..6d48338e8100 100644 > > > --- a/drivers/media/platform/Kconfig > > > +++ b/drivers/media/platform/Kconfig > > > @@ -5,7 +5,6 @@ > > > > > > menuconfig V4L_PLATFORM_DRIVERS > > > bool "V4L platform devices" > > > - depends on MEDIA_CAMERA_SUPPORT > > > help > > > Say Y here to enable support for platform-specific V4L drivers. > > > > > > @@ -43,7 +42,6 @@ config VIDEO_ASPEED > > > > > > config VIDEO_SH_VOU > > > tristate "SuperH VOU video output driver" > > > - depends on MEDIA_CAMERA_SUPPORT > > > depends on VIDEO_DEV && I2C > > > depends on ARCH_SHMOBILE || COMPILE_TEST > > > select VIDEOBUF2_DMA_CONTIG > > > @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS > > > menuconfig V4L_MEM2MEM_DRIVERS > > > bool "Memory-to-memory multimedia devices" > > > depends on VIDEO_V4L2 > > > - depends on MEDIA_CAMERA_SUPPORT > > > help > > > Say Y here to enable selecting drivers for V4L devices that > > > use system memory for both source and destination buffers, as opposed > > > @@ -534,7 +531,6 @@ config VIDEO_TI_CSC > > > > > > menuconfig V4L_TEST_DRIVERS > > > bool "Media test drivers" > > > - depends on MEDIA_CAMERA_SUPPORT > > > > > > if V4L_TEST_DRIVERS > > > > > > @@ -557,7 +553,6 @@ endif #V4L_TEST_DRIVERS > > > > > > menuconfig DVB_PLATFORM_DRIVERS > > > bool "DVB platform devices" > > > - depends on MEDIA_DIGITAL_TV_SUPPORT > > > help > > > Say Y here to enable support for platform-specific Digital TV drivers. > > > > > > @@ -567,7 +562,6 @@ endif #DVB_PLATFORM_DRIVERS > > > > > > menuconfig CEC_PLATFORM_DRIVERS > > > bool "CEC platform devices" > > > - depends on MEDIA_CEC_SUPPORT > > > > > > if CEC_PLATFORM_DRIVERS > > > > > > @@ -692,7 +686,6 @@ endif #CEC_PLATFORM_DRIVERS > > > > > > menuconfig SDR_PLATFORM_DRIVERS > > > bool "SDR platform devices" > > > - depends on MEDIA_SDR_SUPPORT > > > help > > > Say Y here to enable support for platform-specific SDR Drivers. > > > > > > diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig > > > index eb79d99787bd..e19ba6ab6e48 100644 > > > --- a/drivers/media/radio/Kconfig > > > +++ b/drivers/media/radio/Kconfig > > > @@ -6,7 +6,6 @@ > > > menuconfig RADIO_ADAPTERS > > > bool "Radio Adapters" > > > depends on VIDEO_V4L2 > > > - depends on MEDIA_RADIO_SUPPORT > > > default y > > > help > > > Say Y here to enable selecting AM/FM radio adapters. > > > diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig > > > index e104bb7766e1..7af7ff174eea 100644 > > > --- a/drivers/media/tuners/Kconfig > > > +++ b/drivers/media/tuners/Kconfig > > > @@ -2,26 +2,24 @@ > > > # Analog TV tuners, auto-loaded via tuner.ko > > > config MEDIA_TUNER > > > tristate > > > - depends on (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT) && I2C > > > + depends on I2C > > > default y > > > select MEDIA_TUNER_XC2028 if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_XC4000 if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_MT20XX if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT > > > - select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT > > > - select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT > > > + select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT > > > + select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT > > > > > > comment "Tuner drivers hidden by 'Autoselect ancillary drivers'" > > > depends on MEDIA_HIDE_ANCILLARY_SUBDRV > > > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > > > > > > menu "Customize TV tuners" > > > visible if !MEDIA_HIDE_ANCILLARY_SUBDRV > > > - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > > > > > > config MEDIA_TUNER_SIMPLE > > > tristate "Simple tuner support" > > > diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig > > > index e678d3d11467..72c88b1add55 100644 > > > --- a/drivers/media/usb/Kconfig > > > +++ b/drivers/media/usb/Kconfig > > > @@ -9,8 +9,7 @@ menuconfig MEDIA_USB_SUPPORT > > > > > > if MEDIA_USB_SUPPORT > > > > > > -if MEDIA_CAMERA_SUPPORT > > > - comment "Webcam devices" > > > +comment "Webcam devices" > > > source "drivers/media/usb/uvc/Kconfig" > > > source "drivers/media/usb/gspca/Kconfig" > > > source "drivers/media/usb/pwc/Kconfig" > > > @@ -19,26 +18,19 @@ source "drivers/media/usb/zr364xx/Kconfig" > > > source "drivers/media/usb/stkwebcam/Kconfig" > > > source "drivers/media/usb/s2255/Kconfig" > > > source "drivers/media/usb/usbtv/Kconfig" > > > -endif > > > > > > -if MEDIA_ANALOG_TV_SUPPORT > > > - comment "Analog TV USB devices" > > > +comment "Analog TV USB devices" > > > source "drivers/media/usb/pvrusb2/Kconfig" > > > source "drivers/media/usb/hdpvr/Kconfig" > > > source "drivers/media/usb/stk1160/Kconfig" > > > source "drivers/media/usb/go7007/Kconfig" > > > -endif > > > > > > -if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) > > > - comment "Analog/digital TV USB devices" > > > +comment "Analog/digital TV USB devices" > > > source "drivers/media/usb/au0828/Kconfig" > > > source "drivers/media/usb/cx231xx/Kconfig" > > > source "drivers/media/usb/tm6000/Kconfig" > > > -endif > > > > > > - > > > -if I2C && MEDIA_DIGITAL_TV_SUPPORT > > > - comment "Digital TV USB devices" > > > +comment "Digital TV USB devices" > > > source "drivers/media/usb/dvb-usb/Kconfig" > > > source "drivers/media/usb/dvb-usb-v2/Kconfig" > > > source "drivers/media/usb/ttusb-budget/Kconfig" > > > @@ -46,25 +38,18 @@ source "drivers/media/usb/ttusb-dec/Kconfig" > > > source "drivers/media/usb/siano/Kconfig" > > > source "drivers/media/usb/b2c2/Kconfig" > > > source "drivers/media/usb/as102/Kconfig" > > > -endif > > > > > > -if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) > > > - comment "Webcam, TV (analog/digital) USB devices" > > > +comment "Webcam, TV (analog/digital) USB devices" > > > source "drivers/media/usb/em28xx/Kconfig" > > > -endif > > > > > > -if MEDIA_SDR_SUPPORT > > > - comment "Software defined radio USB devices" > > > +comment "Software defined radio USB devices" > > > source "drivers/media/usb/airspy/Kconfig" > > > source "drivers/media/usb/hackrf/Kconfig" > > > source "drivers/media/usb/msi2500/Kconfig" > > > -endif > > > > > > -if MEDIA_CEC_SUPPORT > > > - comment "USB HDMI CEC adapters" > > > +comment "USB HDMI CEC adapters" > > > source "drivers/media/usb/pulse8-cec/Kconfig" > > > source "drivers/media/usb/rainshadow-cec/Kconfig" > > > -endif > > > > > > endif #MEDIA_USB_SUPPORT > > > endif #USB > > > diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig > > > index b21a4d413872..8ebda4361b65 100644 > > > --- a/drivers/media/usb/dvb-usb-v2/Kconfig > > > +++ b/drivers/media/usb/dvb-usb-v2/Kconfig > > > @@ -137,7 +137,7 @@ config DVB_USB_RTL28XXU > > > select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT > > > select DVB_RTL2830 > > > select DVB_RTL2832 > > > - select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT) > > > + select DVB_RTL2832_SDR if MEDIA_SUBDRV_AUTOSELECT > > > select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_E4000 if MEDIA_SUBDRV_AUTOSELECT > > > select MEDIA_TUNER_FC0012 if MEDIA_SUBDRV_AUTOSELECT > > > diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig > > > index f2031a933e54..7031d6e80304 100644 > > > --- a/drivers/media/usb/em28xx/Kconfig > > > +++ b/drivers/media/usb/em28xx/Kconfig > > > @@ -12,8 +12,8 @@ config VIDEO_EM28XX_V4L2 > > > select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT > > > select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT > > > select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT > > > - select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > > > - select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > > > + select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT > > > + select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT > > > help > > > This is a video4linux driver for Empia 28xx based TV cards. > > > > > > diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig > > > index 4ff79940ad8d..533e95375082 100644 > > > --- a/drivers/media/usb/go7007/Kconfig > > > +++ b/drivers/media/usb/go7007/Kconfig > > > @@ -12,7 +12,7 @@ config VIDEO_GO7007 > > > select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT > > > select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT > > > select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT > > > - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > > > + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT > > > select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT > > > help > > > This is a video4linux driver for the WIS GO7007 MPEG > > > diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig > > > index 93bc9bef7641..e68af4112505 100644 > > > --- a/sound/pci/Kconfig > > > +++ b/sound/pci/Kconfig > > > @@ -557,7 +557,6 @@ config SND_ES1968_INPUT > > > config SND_ES1968_RADIO > > > bool "Enable TEA5757 radio tuner support for es1968" > > > depends on SND_ES1968 > > > - depends on MEDIA_RADIO_SUPPORT > > > depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 > > > select RADIO_ADAPTERS > > > select RADIO_TEA575X > > > @@ -581,7 +580,6 @@ config SND_FM801 > > > config SND_FM801_TEA575X_BOOL > > > bool "ForteMedia FM801 + TEA5757 tuner" > > > depends on SND_FM801 > > > - depends on MEDIA_RADIO_SUPPORT > > > depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 > > > select RADIO_ADAPTERS > > > select RADIO_TEA575X > > > > > > Thanks, > > Mauro > > Thanks, Mauro
Hello, On 3/21/20 10:51 AM, Mauro Carvalho Chehab wrote: > Em Sat, 21 Mar 2020 09:39:02 -0300 > Ezequiel Garcia <ezequiel@collabora.com> escreveu: > >>>> In other words, the following are removed: MEDIA_ANALOG_TV_SUPPORT, >>>> MEDIA_DIGITAL_TV_SUPPORT, MEDIA_CAMERA_SUPPORT, MEDIA_RADIO_SUPPORT, >>>> MEDIA_CEC_SUPPORT and MEDIA_SDR_SUPPORT. >>>> >>>> As a result, the configuration is now simplified. Users >>>> will find USB capture devices under "Media USB Adapters", >>>> or CEC adapters under "CEC platform devices", without >>>> the need to enable any other "support" options. >>> >>> Nack. >>> >> >> Well, at least I got your attention on this topic :-) > > :-) > >> >>> Those *_SUPPORT options were added to make life easier for users. >>> There are too many things to be customized for a poor user to >>> select the right options. So, from an end-user's perspective, >>> what he really wants is: >>> >> >> Do you think end-user's configure their own kernel? > > They actually do, either directly or via media-build tree. I just want to share my experience teaching kernel dev to students at https://lkcamp.dev/ There are just too much information in menuconfig, using a lot of terms, and people get overwhelmed. So, when they need to enable something in menuconfig, they search for the item with the slash / tool, and trackdown dependencies, searching one by one to enable all of them. So they don't navigate through the menu, since they want to enable one specific thing, and they don't want to keep searching and reading all the entries in menuconfig. And having MEDIA_CAMERA_SUPPORT is just another dependency to trackdown, so I would rather not having it. > >> I was under the assumption an end-user would use >> a distribution kernel. And distributions would take care >> of packaging what end-users need. >> >>> "let me enable my TV card >>> or: >>> "I want to enable camera support" I don't think it is just that, there are two steps: 1. "let me enable my TV card" and: 2. "I want to enable my specific TV card now" or: 1. "I want to enable camera support" and: 2. "I want to enable my specific camera now" I understand that, to execute the second step above, less options would be nice. But, If I compare the current menu with the proposed one (see below), the "support" options doens't seem to be hiding much, and we could remove one step for users. Current menu: ============= --- Multimedia support *** Multimedia core support *** [ ] Cameras/video grabbers support (NEW) [ ] Analog TV support (NEW) [ ] Digital TV support (NEW) [ ] AM/FM radio receivers/transmitters support (NEW) [ ] Software defined radio support (NEW) [ ] HDMI CEC support (NEW) [ ] Enable advanced debug functionality on V4L2 drivers [ ] Enable old-style fixed minor ranges on drivers/video devices *** Media drivers *** [ ] Media USB Adapters ---- [ ] Media PCI Adapters ---- *** Supported MMC/SDIO adapters *** < > Cypress firmware helper routines *** Media ancillary drivers (tuners, sensors, i2c, spi, frontends) *** Customise DVB Frontends ---> Ezequiel's patch menu: ====================== --- Multimedia support *** Multimedia core support *** [ ] Media Controller API [ ] Enable advanced debug functionality on V4L2 drivers (NEW) [ ] Enable old-style fixed minor ranges on drivers/video devices (NEW) [ ] Enable DVB memory-mapped API (EXPERIMENTAL) (NEW) [*] DVB Network Support (NEW) (16) maximum number of DVB/ATSC adapters (NEW) [ ] Dynamic DVB minor allocation (NEW) [ ] Enable DVB demux section packet loss log (NEW) [ ] Enable DVB net ULE packet debug messages (NEW) *** Media drivers *** [ ] Media USB Adapters (NEW) ---- [ ] Media PCI Adapters (NEW) ---- [*] V4L platform devices ---> [ ] Memory-to-memory multimedia devices (NEW) ---- [*] Media test drivers ---> [ ] DVB platform devices (NEW) ---- [ ] CEC platform devices (NEW) ---- [ ] SDR platform devices (NEW) ---- *** Supported MMC/SDIO adapters *** [*] Radio Adapters (NEW) ---> < > Cypress firmware helper routines (NEW) *** Media ancillary drivers (tuners, sensors, i2c, spi, frontends) *** [*] Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends) (NEW) *** I2C drivers hidden by 'Autoselect ancillary drivers' *** *** SPI drivers hidden by 'Autoselect ancillary drivers' *** *** Tuner drivers hidden by 'Autoselect ancillary drivers' *** *** DVB Frontend drivers hidden by 'Autoselect ancillary drivers' *** >>> >>> They usually don't know what driver supports it, nor what are >>> the other drivers that should be enabled behind the scenes. Users need to know how to track dependencies anyway. Several drivers requires "Media Controller API" for instance, which is not intuitive for endusers, nor "V4L2 sub-device userspace API", and users need to know this somehow. So I suppose most of users checks the "Depends on" list throug the search of help tool, and the "support" option is just another item on this list. Or they just follow a tutorial on the internet indicating what should be enabled, and we could remove one option/step for them to follow. Another option would be to expose the drivers, and use "select" instead of "depends on" in Kconfig. I mean, we could have a menu you can enter down it: [ ] Camera/Video grabbers devices (NEW) ---- And under this menu, list all camera/video drivers. And selecting one of those, it would automatically select "Media Controller API" and/or "V4L2 sub-device userspace API". So endusers would just say "I want this device enabled", without worriying about these dependencies. But this doesn't seem easy to do (since it would require changes in all drivers). Anyway, just put in my two cents. Regards, Helen >>> >>> Those options helps the users to reduce the amount of options >>> for them to identify what they really bother, instead of >>> presenting thousands of options they would need. >>> >>> Now, if you, instead, add some patch that would allow them >>> to do something like: >>> >>> make board=<usb id> / make board=<pci id> >>> >>> Then this would be very welcomed. >>> >> >> Hm, I see. >> >> So, another option is to clean memory-to-memory devices >> (codecs). There are no end-users for these devices, >> and they aren't really "Cameras/video grabbers". >> >> I am not sure why we've added them under CAMERA_SUPPORT. >> I'd love to get rid of at least that dependency. > > Good question. Probably because people just re-used what it > was there without thinking too much. > > I remember someone once proposed adding an option to add > a "MEDIA_EMBEDDED" (or some other name) that would > just allow setting everything as if those other *SUPORT > koptions didn't exist. > > something like this would do the trick: > > CONFIG_MEDIA_EMBEDDED > bool > > config MEDIA_CAMERA_SUPPORT > visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT > default y if CONFIG_MEDIA_EMBEDDED_SUPPORT > > config MEDIA_ANALOG_TV_SUPPORT > visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT > default y if CONFIG_MEDIA_EMBEDDED_SUPPORT > > config MEDIA_DIGITAL_TV_SUPPORT > visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT > default y if CONFIG_MEDIA_EMBEDDED_SUPPORT > > config MEDIA_RADIO_SUPPORT > visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT > default y if CONFIG_MEDIA_EMBEDDED_SUPPORT > > Regards, > Mauro > >> >> diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig >> index 3b9795cfcb36..9382e35211ca 100644 >> --- a/drivers/media/mc/Kconfig >> +++ b/drivers/media/mc/Kconfig >> @@ -5,7 +5,6 @@ >> >> config MEDIA_CONTROLLER >> bool "Media Controller API" >> - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT >> help >> Enable the media controller API used to query media devices internal >> topology and configure it dynamically. >> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig >> index f65e98d3adf2..dc5869dac5dc 100644 >> --- a/drivers/media/platform/Kconfig >> +++ b/drivers/media/platform/Kconfig >> @@ -5,7 +5,6 @@ >> >> menuconfig V4L_PLATFORM_DRIVERS >> bool "V4L platform devices" >> - depends on MEDIA_CAMERA_SUPPORT >> help >> Say Y here to enable support for platform-specific V4L drivers. >> >> @@ -43,7 +42,6 @@ config VIDEO_ASPEED >> >> config VIDEO_SH_VOU >> tristate "SuperH VOU video output driver" >> - depends on MEDIA_CAMERA_SUPPORT >> depends on VIDEO_DEV && I2C >> depends on ARCH_SHMOBILE || COMPILE_TEST >> select VIDEOBUF2_DMA_CONTIG >> @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS >> menuconfig V4L_MEM2MEM_DRIVERS >> bool "Memory-to-memory multimedia devices" >> depends on VIDEO_V4L2 >> - depends on MEDIA_CAMERA_SUPPORT >> help >> Say Y here to enable selecting drivers for V4L devices that >> use system memory for both source and destination buffers, as opposed >> @@ -522,7 +519,6 @@ config VIDEO_TI_CSC >> >> menuconfig V4L_TEST_DRIVERS >> bool "Media test drivers" >> - depends on MEDIA_CAMERA_SUPPORT >> >> if V4L_TEST_DRIVERS >> >> >> Cheers, >> Ezequiel >> >>>> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> >>>> --- >>>> drivers/media/Kconfig | 61 ---------------------------- >>>> drivers/media/dvb-frontends/Kconfig | 2 +- >>>> drivers/media/i2c/Kconfig | 14 +------ >>>> drivers/media/i2c/m5mols/Kconfig | 1 - >>>> drivers/media/i2c/smiapp/Kconfig | 1 - >>>> drivers/media/mc/Kconfig | 1 - >>>> drivers/media/pci/Kconfig | 18 ++------ >>>> drivers/media/pci/bt8xx/Kconfig | 1 - >>>> drivers/media/platform/Kconfig | 7 ---- >>>> drivers/media/radio/Kconfig | 1 - >>>> drivers/media/tuners/Kconfig | 8 ++-- >>>> drivers/media/usb/Kconfig | 29 ++++--------- >>>> drivers/media/usb/dvb-usb-v2/Kconfig | 2 +- >>>> drivers/media/usb/em28xx/Kconfig | 4 +- >>>> drivers/media/usb/go7007/Kconfig | 2 +- >>>> sound/pci/Kconfig | 2 - >>>> 16 files changed, 20 insertions(+), 134 deletions(-) >>>> >>>> diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig >>>> index 9dfea5c4b6ab..fcbf265a92cd 100644 >>>> --- a/drivers/media/Kconfig >>>> +++ b/drivers/media/Kconfig >>>> @@ -30,63 +30,6 @@ comment "Multimedia core support" >>>> # >>>> # Multimedia support - automatically enable V4L2 and DVB core >>>> # >>>> -config MEDIA_CAMERA_SUPPORT >>>> - bool "Cameras/video grabbers support" >>>> - help >>>> - Enable support for webcams and video grabbers. >>>> - >>>> - Say Y when you have a webcam or a video capture grabber board. >>>> - >>>> -config MEDIA_ANALOG_TV_SUPPORT >>>> - bool "Analog TV support" >>>> - help >>>> - Enable analog TV support. >>>> - >>>> - Say Y when you have a TV board with analog support or with a >>>> - hybrid analog/digital TV chipset. >>>> - >>>> - Note: There are several DVB cards that are based on chips that >>>> - support both analog and digital TV. Disabling this option >>>> - will disable support for them. >>>> - >>>> -config MEDIA_DIGITAL_TV_SUPPORT >>>> - bool "Digital TV support" >>>> - help >>>> - Enable digital TV support. >>>> - >>>> - Say Y when you have a board with digital support or a board with >>>> - hybrid digital TV and analog TV. >>>> - >>>> -config MEDIA_RADIO_SUPPORT >>>> - bool "AM/FM radio receivers/transmitters support" >>>> - help >>>> - Enable AM/FM radio support. >>>> - >>>> - Additional info and docs are available on the web at >>>> - <https://linuxtv.org> >>>> - >>>> - Say Y when you have a board with radio support. >>>> - >>>> - Note: There are several TV cards that are based on chips that >>>> - support radio reception. Disabling this option will >>>> - disable support for them. >>>> - >>>> -config MEDIA_SDR_SUPPORT >>>> - bool "Software defined radio support" >>>> - help >>>> - Enable software defined radio support. >>>> - >>>> - Say Y when you have a software defined radio device. >>>> - >>>> -config MEDIA_CEC_SUPPORT >>>> - bool "HDMI CEC support" >>>> - help >>>> - Enable support for HDMI CEC (Consumer Electronics Control), >>>> - which is an optional HDMI feature. >>>> - >>>> - Say Y when you have an HDMI receiver, transmitter or a USB CEC >>>> - adapter that supports HDMI CEC. >>>> - >>>> source "drivers/media/cec/Kconfig" >>>> >>>> source "drivers/media/mc/Kconfig" >>>> @@ -99,7 +42,6 @@ source "drivers/media/mc/Kconfig" >>>> config VIDEO_DEV >>>> tristate >>>> depends on MEDIA_SUPPORT >>>> - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT >>>> default y >>>> >>>> config VIDEO_V4L2_SUBDEV_API >>>> @@ -121,7 +63,6 @@ source "drivers/media/v4l2-core/Kconfig" >>>> config DVB_CORE >>>> tristate >>>> depends on MEDIA_SUPPORT >>>> - depends on MEDIA_DIGITAL_TV_SUPPORT >>>> depends on (I2C || I2C=n) >>>> default y >>>> select CRC32 >>>> @@ -186,7 +127,6 @@ comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" >>>> >>>> config MEDIA_SUBDRV_AUTOSELECT >>>> bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" >>>> - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT >>>> depends on HAS_IOMEM >>>> select I2C >>>> select I2C_MUX >>>> @@ -214,7 +154,6 @@ config MEDIA_HIDE_ANCILLARY_SUBDRV >>>> >>>> config MEDIA_ATTACH >>>> bool >>>> - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT >>>> depends on MODULES >>>> default MODULES >>>> >>>> diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig >>>> index a29e9ddf9c82..832f66b91459 100644 >>>> --- a/drivers/media/dvb-frontends/Kconfig >>>> +++ b/drivers/media/dvb-frontends/Kconfig >>>> @@ -518,7 +518,7 @@ config DVB_RTL2832 >>>> >>>> config DVB_RTL2832_SDR >>>> tristate "Realtek RTL2832 SDR" >>>> - depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && MEDIA_SDR_SUPPORT && USB >>>> + depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && USB >>>> select DVB_RTL2832 >>>> select VIDEOBUF2_VMALLOC >>>> default m if !MEDIA_SUBDRV_AUTOSELECT >>>> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig >>>> index 125d596c13dd..92e51c288321 100644 >>>> --- a/drivers/media/i2c/Kconfig >>>> +++ b/drivers/media/i2c/Kconfig >>>> @@ -568,8 +568,6 @@ config VIDEO_APTINA_PLL >>>> config VIDEO_SMIAPP_PLL >>>> tristate >>>> >>>> -if MEDIA_CAMERA_SUPPORT >>>> - >>>> config VIDEO_HI556 >>>> tristate "Hynix Hi-556 sensor support" >>>> depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API >>>> @@ -1007,12 +1005,9 @@ config VIDEO_S5C73M3 >>>> help >>>> This is a V4L2 sensor driver for Samsung S5C73M3 >>>> 8 Mpixel camera. >>>> -endif >>>> >>>> comment "Lens drivers" >>>> >>>> -if MEDIA_CAMERA_SUPPORT >>>> - >>>> config VIDEO_AD5820 >>>> tristate "AD5820 lens voice coil support" >>>> depends on GPIOLIB && I2C && VIDEO_V4L2 && MEDIA_CONTROLLER >>>> @@ -1050,12 +1045,8 @@ config VIDEO_DW9807_VCM >>>> capability. This is designed for linear control of >>>> voice coil motors, controlled via I2C serial interface. >>>> >>>> -endif >>>> - >>>> comment "Flash devices" >>>> >>>> -if MEDIA_CAMERA_SUPPORT >>>> - >>>> config VIDEO_ADP1653 >>>> tristate "ADP1653 flash support" >>>> depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER >>>> @@ -1079,8 +1070,6 @@ config VIDEO_LM3646 >>>> This is a driver for the lm3646 dual flash controllers. It controls >>>> flash, torch LEDs. >>>> >>>> -endif >>>> - >>>> comment "Video improvement chips" >>>> >>>> config VIDEO_UPD64031A >>>> @@ -1123,7 +1112,7 @@ comment "SDR tuner chips" >>>> >>>> config SDR_MAX2175 >>>> tristate "Maxim 2175 RF to Bits tuner" >>>> - depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C >>>> + depends on VIDEO_V4L2 && I2C >>>> select REGMAP_I2C >>>> help >>>> Support for Maxim 2175 tuner. It is an advanced analog/digital >>>> @@ -1169,7 +1158,6 @@ config VIDEO_I2C >>>> config VIDEO_ST_MIPID02 >>>> tristate "STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge" >>>> depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API >>>> - depends on MEDIA_CAMERA_SUPPORT >>>> select V4L2_FWNODE >>>> help >>>> Support for STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge. >>>> diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kconfig >>>> index e573482f269f..91c0dafc7668 100644 >>>> --- a/drivers/media/i2c/m5mols/Kconfig >>>> +++ b/drivers/media/i2c/m5mols/Kconfig >>>> @@ -2,6 +2,5 @@ >>>> config VIDEO_M5MOLS >>>> tristate "Fujitsu M-5MOLS 8MP sensor support" >>>> depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API >>>> - depends on MEDIA_CAMERA_SUPPORT >>>> help >>>> This driver supports Fujitsu M-5MOLS camera sensor with ISP >>>> diff --git a/drivers/media/i2c/smiapp/Kconfig b/drivers/media/i2c/smiapp/Kconfig >>>> index fcaa7f9494a8..a2f5775dfcac 100644 >>>> --- a/drivers/media/i2c/smiapp/Kconfig >>>> +++ b/drivers/media/i2c/smiapp/Kconfig >>>> @@ -2,7 +2,6 @@ >>>> config VIDEO_SMIAPP >>>> tristate "SMIA++/SMIA sensor support" >>>> depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK >>>> - depends on MEDIA_CAMERA_SUPPORT >>>> select VIDEO_SMIAPP_PLL >>>> select V4L2_FWNODE >>>> help >>>> diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig >>>> index 3b9795cfcb36..9382e35211ca 100644 >>>> --- a/drivers/media/mc/Kconfig >>>> +++ b/drivers/media/mc/Kconfig >>>> @@ -5,7 +5,6 @@ >>>> >>>> config MEDIA_CONTROLLER >>>> bool "Media Controller API" >>>> - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT >>>> help >>>> Enable the media controller API used to query media devices internal >>>> topology and configure it dynamically. >>>> diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig >>>> index dcb3719f440e..3d2cc135acd6 100644 >>>> --- a/drivers/media/pci/Kconfig >>>> +++ b/drivers/media/pci/Kconfig >>>> @@ -9,25 +9,20 @@ menuconfig MEDIA_PCI_SUPPORT >>>> >>>> if MEDIA_PCI_SUPPORT >>>> >>>> -if MEDIA_CAMERA_SUPPORT >>>> - comment "Media capture support" >>>> +comment "Media capture support" >>>> source "drivers/media/pci/meye/Kconfig" >>>> source "drivers/media/pci/solo6x10/Kconfig" >>>> source "drivers/media/pci/sta2x11/Kconfig" >>>> source "drivers/media/pci/tw5864/Kconfig" >>>> source "drivers/media/pci/tw68/Kconfig" >>>> source "drivers/media/pci/tw686x/Kconfig" >>>> -endif >>>> >>>> -if MEDIA_ANALOG_TV_SUPPORT >>>> - comment "Media capture/analog TV support" >>>> +comment "Media capture/analog TV support" >>>> source "drivers/media/pci/ivtv/Kconfig" >>>> source "drivers/media/pci/saa7146/Kconfig" >>>> source "drivers/media/pci/dt3155/Kconfig" >>>> -endif >>>> >>>> -if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT >>>> - comment "Media capture/analog/hybrid TV support" >>>> +comment "Media capture/analog/hybrid TV support" >>>> source "drivers/media/pci/cx18/Kconfig" >>>> source "drivers/media/pci/cx23885/Kconfig" >>>> source "drivers/media/pci/cx25821/Kconfig" >>>> @@ -37,10 +32,7 @@ source "drivers/media/pci/saa7134/Kconfig" >>>> source "drivers/media/pci/saa7164/Kconfig" >>>> source "drivers/media/pci/cobalt/Kconfig" >>>> >>>> -endif >>>> - >>>> -if MEDIA_DIGITAL_TV_SUPPORT >>>> - comment "Media digital TV PCI Adapters" >>>> +comment "Media digital TV PCI Adapters" >>>> source "drivers/media/pci/ttpci/Kconfig" >>>> source "drivers/media/pci/b2c2/Kconfig" >>>> source "drivers/media/pci/pluto2/Kconfig" >>>> @@ -52,8 +44,6 @@ source "drivers/media/pci/ngene/Kconfig" >>>> source "drivers/media/pci/ddbridge/Kconfig" >>>> source "drivers/media/pci/smipcie/Kconfig" >>>> source "drivers/media/pci/netup_unidvb/Kconfig" >>>> -endif >>>> - >>>> source "drivers/media/pci/intel/ipu3/Kconfig" >>>> >>>> endif #MEDIA_PCI_SUPPORT >>>> diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig >>>> index 75d172a6f54c..a4522c35d606 100644 >>>> --- a/drivers/media/pci/bt8xx/Kconfig >>>> +++ b/drivers/media/pci/bt8xx/Kconfig >>>> @@ -5,7 +5,6 @@ config VIDEO_BT848 >>>> select I2C_ALGOBIT >>>> select VIDEOBUF_DMA_SG >>>> depends on RC_CORE >>>> - depends on MEDIA_RADIO_SUPPORT >>>> select VIDEO_TUNER >>>> select VIDEO_TVEEPROM >>>> select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT >>>> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig >>>> index e01bbb9dd1c1..6d48338e8100 100644 >>>> --- a/drivers/media/platform/Kconfig >>>> +++ b/drivers/media/platform/Kconfig >>>> @@ -5,7 +5,6 @@ >>>> >>>> menuconfig V4L_PLATFORM_DRIVERS >>>> bool "V4L platform devices" >>>> - depends on MEDIA_CAMERA_SUPPORT >>>> help >>>> Say Y here to enable support for platform-specific V4L drivers. >>>> >>>> @@ -43,7 +42,6 @@ config VIDEO_ASPEED >>>> >>>> config VIDEO_SH_VOU >>>> tristate "SuperH VOU video output driver" >>>> - depends on MEDIA_CAMERA_SUPPORT >>>> depends on VIDEO_DEV && I2C >>>> depends on ARCH_SHMOBILE || COMPILE_TEST >>>> select VIDEOBUF2_DMA_CONTIG >>>> @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS >>>> menuconfig V4L_MEM2MEM_DRIVERS >>>> bool "Memory-to-memory multimedia devices" >>>> depends on VIDEO_V4L2 >>>> - depends on MEDIA_CAMERA_SUPPORT >>>> help >>>> Say Y here to enable selecting drivers for V4L devices that >>>> use system memory for both source and destination buffers, as opposed >>>> @@ -534,7 +531,6 @@ config VIDEO_TI_CSC >>>> >>>> menuconfig V4L_TEST_DRIVERS >>>> bool "Media test drivers" >>>> - depends on MEDIA_CAMERA_SUPPORT >>>> >>>> if V4L_TEST_DRIVERS >>>> >>>> @@ -557,7 +553,6 @@ endif #V4L_TEST_DRIVERS >>>> >>>> menuconfig DVB_PLATFORM_DRIVERS >>>> bool "DVB platform devices" >>>> - depends on MEDIA_DIGITAL_TV_SUPPORT >>>> help >>>> Say Y here to enable support for platform-specific Digital TV drivers. >>>> >>>> @@ -567,7 +562,6 @@ endif #DVB_PLATFORM_DRIVERS >>>> >>>> menuconfig CEC_PLATFORM_DRIVERS >>>> bool "CEC platform devices" >>>> - depends on MEDIA_CEC_SUPPORT >>>> >>>> if CEC_PLATFORM_DRIVERS >>>> >>>> @@ -692,7 +686,6 @@ endif #CEC_PLATFORM_DRIVERS >>>> >>>> menuconfig SDR_PLATFORM_DRIVERS >>>> bool "SDR platform devices" >>>> - depends on MEDIA_SDR_SUPPORT >>>> help >>>> Say Y here to enable support for platform-specific SDR Drivers. >>>> >>>> diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig >>>> index eb79d99787bd..e19ba6ab6e48 100644 >>>> --- a/drivers/media/radio/Kconfig >>>> +++ b/drivers/media/radio/Kconfig >>>> @@ -6,7 +6,6 @@ >>>> menuconfig RADIO_ADAPTERS >>>> bool "Radio Adapters" >>>> depends on VIDEO_V4L2 >>>> - depends on MEDIA_RADIO_SUPPORT >>>> default y >>>> help >>>> Say Y here to enable selecting AM/FM radio adapters. >>>> diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig >>>> index e104bb7766e1..7af7ff174eea 100644 >>>> --- a/drivers/media/tuners/Kconfig >>>> +++ b/drivers/media/tuners/Kconfig >>>> @@ -2,26 +2,24 @@ >>>> # Analog TV tuners, auto-loaded via tuner.ko >>>> config MEDIA_TUNER >>>> tristate >>>> - depends on (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT) && I2C >>>> + depends on I2C >>>> default y >>>> select MEDIA_TUNER_XC2028 if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_XC4000 if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_MT20XX if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT >>>> - select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT >>>> - select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT >>>> + select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT >>>> + select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT >>>> >>>> comment "Tuner drivers hidden by 'Autoselect ancillary drivers'" >>>> depends on MEDIA_HIDE_ANCILLARY_SUBDRV >>>> - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT >>>> >>>> menu "Customize TV tuners" >>>> visible if !MEDIA_HIDE_ANCILLARY_SUBDRV >>>> - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT >>>> >>>> config MEDIA_TUNER_SIMPLE >>>> tristate "Simple tuner support" >>>> diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig >>>> index e678d3d11467..72c88b1add55 100644 >>>> --- a/drivers/media/usb/Kconfig >>>> +++ b/drivers/media/usb/Kconfig >>>> @@ -9,8 +9,7 @@ menuconfig MEDIA_USB_SUPPORT >>>> >>>> if MEDIA_USB_SUPPORT >>>> >>>> -if MEDIA_CAMERA_SUPPORT >>>> - comment "Webcam devices" >>>> +comment "Webcam devices" >>>> source "drivers/media/usb/uvc/Kconfig" >>>> source "drivers/media/usb/gspca/Kconfig" >>>> source "drivers/media/usb/pwc/Kconfig" >>>> @@ -19,26 +18,19 @@ source "drivers/media/usb/zr364xx/Kconfig" >>>> source "drivers/media/usb/stkwebcam/Kconfig" >>>> source "drivers/media/usb/s2255/Kconfig" >>>> source "drivers/media/usb/usbtv/Kconfig" >>>> -endif >>>> >>>> -if MEDIA_ANALOG_TV_SUPPORT >>>> - comment "Analog TV USB devices" >>>> +comment "Analog TV USB devices" >>>> source "drivers/media/usb/pvrusb2/Kconfig" >>>> source "drivers/media/usb/hdpvr/Kconfig" >>>> source "drivers/media/usb/stk1160/Kconfig" >>>> source "drivers/media/usb/go7007/Kconfig" >>>> -endif >>>> >>>> -if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) >>>> - comment "Analog/digital TV USB devices" >>>> +comment "Analog/digital TV USB devices" >>>> source "drivers/media/usb/au0828/Kconfig" >>>> source "drivers/media/usb/cx231xx/Kconfig" >>>> source "drivers/media/usb/tm6000/Kconfig" >>>> -endif >>>> >>>> - >>>> -if I2C && MEDIA_DIGITAL_TV_SUPPORT >>>> - comment "Digital TV USB devices" >>>> +comment "Digital TV USB devices" >>>> source "drivers/media/usb/dvb-usb/Kconfig" >>>> source "drivers/media/usb/dvb-usb-v2/Kconfig" >>>> source "drivers/media/usb/ttusb-budget/Kconfig" >>>> @@ -46,25 +38,18 @@ source "drivers/media/usb/ttusb-dec/Kconfig" >>>> source "drivers/media/usb/siano/Kconfig" >>>> source "drivers/media/usb/b2c2/Kconfig" >>>> source "drivers/media/usb/as102/Kconfig" >>>> -endif >>>> >>>> -if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) >>>> - comment "Webcam, TV (analog/digital) USB devices" >>>> +comment "Webcam, TV (analog/digital) USB devices" >>>> source "drivers/media/usb/em28xx/Kconfig" >>>> -endif >>>> >>>> -if MEDIA_SDR_SUPPORT >>>> - comment "Software defined radio USB devices" >>>> +comment "Software defined radio USB devices" >>>> source "drivers/media/usb/airspy/Kconfig" >>>> source "drivers/media/usb/hackrf/Kconfig" >>>> source "drivers/media/usb/msi2500/Kconfig" >>>> -endif >>>> >>>> -if MEDIA_CEC_SUPPORT >>>> - comment "USB HDMI CEC adapters" >>>> +comment "USB HDMI CEC adapters" >>>> source "drivers/media/usb/pulse8-cec/Kconfig" >>>> source "drivers/media/usb/rainshadow-cec/Kconfig" >>>> -endif >>>> >>>> endif #MEDIA_USB_SUPPORT >>>> endif #USB >>>> diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig >>>> index b21a4d413872..8ebda4361b65 100644 >>>> --- a/drivers/media/usb/dvb-usb-v2/Kconfig >>>> +++ b/drivers/media/usb/dvb-usb-v2/Kconfig >>>> @@ -137,7 +137,7 @@ config DVB_USB_RTL28XXU >>>> select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT >>>> select DVB_RTL2830 >>>> select DVB_RTL2832 >>>> - select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT) >>>> + select DVB_RTL2832_SDR if MEDIA_SUBDRV_AUTOSELECT >>>> select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_E4000 if MEDIA_SUBDRV_AUTOSELECT >>>> select MEDIA_TUNER_FC0012 if MEDIA_SUBDRV_AUTOSELECT >>>> diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig >>>> index f2031a933e54..7031d6e80304 100644 >>>> --- a/drivers/media/usb/em28xx/Kconfig >>>> +++ b/drivers/media/usb/em28xx/Kconfig >>>> @@ -12,8 +12,8 @@ config VIDEO_EM28XX_V4L2 >>>> select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT >>>> select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT >>>> select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT >>>> - select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT >>>> - select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT >>>> + select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT >>>> + select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT >>>> help >>>> This is a video4linux driver for Empia 28xx based TV cards. >>>> >>>> diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig >>>> index 4ff79940ad8d..533e95375082 100644 >>>> --- a/drivers/media/usb/go7007/Kconfig >>>> +++ b/drivers/media/usb/go7007/Kconfig >>>> @@ -12,7 +12,7 @@ config VIDEO_GO7007 >>>> select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT >>>> select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT >>>> select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT >>>> - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT >>>> + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT >>>> select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT >>>> help >>>> This is a video4linux driver for the WIS GO7007 MPEG >>>> diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig >>>> index 93bc9bef7641..e68af4112505 100644 >>>> --- a/sound/pci/Kconfig >>>> +++ b/sound/pci/Kconfig >>>> @@ -557,7 +557,6 @@ config SND_ES1968_INPUT >>>> config SND_ES1968_RADIO >>>> bool "Enable TEA5757 radio tuner support for es1968" >>>> depends on SND_ES1968 >>>> - depends on MEDIA_RADIO_SUPPORT >>>> depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 >>>> select RADIO_ADAPTERS >>>> select RADIO_TEA575X >>>> @@ -581,7 +580,6 @@ config SND_FM801 >>>> config SND_FM801_TEA575X_BOOL >>>> bool "ForteMedia FM801 + TEA5757 tuner" >>>> depends on SND_FM801 >>>> - depends on MEDIA_RADIO_SUPPORT >>>> depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 >>>> select RADIO_ADAPTERS >>>> select RADIO_TEA575X >>> >>> >>> Thanks, >>> Mauro >> >> > > > > Thanks, > Mauro >
On Mon, Mar 23, 2020 at 2:52 PM Helen Koike <helen.koike@collabora.com> wrote: > > Hello, > > On 3/21/20 10:51 AM, Mauro Carvalho Chehab wrote: > > Em Sat, 21 Mar 2020 09:39:02 -0300 > > Ezequiel Garcia <ezequiel@collabora.com> escreveu: > > > >>>> In other words, the following are removed: MEDIA_ANALOG_TV_SUPPORT, > >>>> MEDIA_DIGITAL_TV_SUPPORT, MEDIA_CAMERA_SUPPORT, MEDIA_RADIO_SUPPORT, > >>>> MEDIA_CEC_SUPPORT and MEDIA_SDR_SUPPORT. > >>>> > >>>> As a result, the configuration is now simplified. Users > >>>> will find USB capture devices under "Media USB Adapters", > >>>> or CEC adapters under "CEC platform devices", without > >>>> the need to enable any other "support" options. > >>> > >>> Nack. > >>> > >> > >> Well, at least I got your attention on this topic :-) > > > > :-) > > > >> > >>> Those *_SUPPORT options were added to make life easier for users. > >>> There are too many things to be customized for a poor user to > >>> select the right options. So, from an end-user's perspective, > >>> what he really wants is: > >>> > >> > >> Do you think end-user's configure their own kernel? > > > > They actually do, either directly or via media-build tree. > > I just want to share my experience teaching kernel dev to students at https://lkcamp.dev/ > > There are just too much information in menuconfig, using a lot of terms, > and people get overwhelmed. > So, when they need to enable something in menuconfig, they search for the item with > the slash / tool, and trackdown dependencies, searching one by one > to enable all of them. > > So they don't navigate through the menu, since they want to enable one > specific thing, and they don't want to keep searching and reading all the entries > in menuconfig. > > And having MEDIA_CAMERA_SUPPORT is just another dependency to trackdown, so I would > rather not having it. > > > > >> I was under the assumption an end-user would use > >> a distribution kernel. And distributions would take care > >> of packaging what end-users need. > >> > >>> "let me enable my TV card > >>> or: > >>> "I want to enable camera support" > > I don't think it is just that, there are two steps: > > 1. "let me enable my TV card" > and: > 2. "I want to enable my specific TV card now" > > or: > > 1. "I want to enable camera support" > and: > 2. "I want to enable my specific camera now" > > I understand that, to execute the second step above, less > options would be nice. > But, If I compare the current menu with the proposed one (see below), the > "support" options doens't seem to be hiding much, and we could remove > one step for users. > > > Current menu: > ============= > --- Multimedia support > *** Multimedia core support *** > [ ] Cameras/video grabbers support (NEW) > [ ] Analog TV support (NEW) > [ ] Digital TV support (NEW) > [ ] AM/FM radio receivers/transmitters support (NEW) > [ ] Software defined radio support (NEW) > [ ] HDMI CEC support (NEW) > [ ] Enable advanced debug functionality on V4L2 drivers > [ ] Enable old-style fixed minor ranges on drivers/video devices > *** Media drivers *** > [ ] Media USB Adapters ---- > [ ] Media PCI Adapters ---- > *** Supported MMC/SDIO adapters *** > < > Cypress firmware helper routines > *** Media ancillary drivers (tuners, sensors, i2c, spi, frontends) *** > Customise DVB Frontends ---> > > Ezequiel's patch menu: > ====================== > --- Multimedia support > *** Multimedia core support *** > [ ] Media Controller API > [ ] Enable advanced debug functionality on V4L2 drivers (NEW) > [ ] Enable old-style fixed minor ranges on drivers/video devices (NEW) > [ ] Enable DVB memory-mapped API (EXPERIMENTAL) (NEW) > [*] DVB Network Support (NEW) > (16) maximum number of DVB/ATSC adapters (NEW) > [ ] Dynamic DVB minor allocation (NEW) > [ ] Enable DVB demux section packet loss log (NEW) > [ ] Enable DVB net ULE packet debug messages (NEW) > *** Media drivers *** > [ ] Media USB Adapters (NEW) ---- > [ ] Media PCI Adapters (NEW) ---- > [*] V4L platform devices ---> > [ ] Memory-to-memory multimedia devices (NEW) ---- > [*] Media test drivers ---> > [ ] DVB platform devices (NEW) ---- > [ ] CEC platform devices (NEW) ---- > [ ] SDR platform devices (NEW) ---- > *** Supported MMC/SDIO adapters *** > [*] Radio Adapters (NEW) ---> > < > Cypress firmware helper routines (NEW) > *** Media ancillary drivers (tuners, sensors, i2c, spi, frontends) *** > [*] Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends) (NEW) > *** I2C drivers hidden by 'Autoselect ancillary drivers' *** > *** SPI drivers hidden by 'Autoselect ancillary drivers' *** > *** Tuner drivers hidden by 'Autoselect ancillary drivers' *** > *** DVB Frontend drivers hidden by 'Autoselect ancillary drivers' *** > > > >>> > >>> They usually don't know what driver supports it, nor what are > >>> the other drivers that should be enabled behind the scenes. > > Users need to know how to track dependencies anyway. > > Several drivers requires "Media Controller API" for instance, which is not > intuitive for endusers, nor "V4L2 sub-device userspace API", and users > need to know this somehow. > > So I suppose most of users checks the "Depends on" list throug the search of help tool, > and the "support" option is just another item on this list. > > Or they just follow a tutorial on the internet indicating what should be enabled, > and we could remove one option/step for them to follow. > > > Another option would be to expose the drivers, and use "select" instead of "depends on" > in Kconfig. > > I mean, we could have a menu you can enter down it: > > [ ] Camera/Video grabbers devices (NEW) ---- > > And under this menu, list all camera/video drivers. > And selecting one of those, it would automatically select > "Media Controller API" and/or "V4L2 sub-device userspace API". > > So endusers would just say "I want this device enabled", without worriying about these > dependencies. But this doesn't seem easy to do (since it would require changes in all drivers). > Agreed that it would make it much easier to enable both entire classes of hardware and specific devices, which covers the needs of users. Best regards, Tomasz > > Anyway, just put in my two cents. > > Regards, > Helen > > >>> > >>> Those options helps the users to reduce the amount of options > >>> for them to identify what they really bother, instead of > >>> presenting thousands of options they would need. > >>> > >>> Now, if you, instead, add some patch that would allow them > >>> to do something like: > >>> > >>> make board=<usb id> / make board=<pci id> > >>> > >>> Then this would be very welcomed. > >>> > >> > >> Hm, I see. > >> > >> So, another option is to clean memory-to-memory devices > >> (codecs). There are no end-users for these devices, > >> and they aren't really "Cameras/video grabbers". > >> > >> I am not sure why we've added them under CAMERA_SUPPORT. > >> I'd love to get rid of at least that dependency. > > > > Good question. Probably because people just re-used what it > > was there without thinking too much. > > > > I remember someone once proposed adding an option to add > > a "MEDIA_EMBEDDED" (or some other name) that would > > just allow setting everything as if those other *SUPORT > > koptions didn't exist. > > > > something like this would do the trick: > > > > CONFIG_MEDIA_EMBEDDED > > bool > > > > config MEDIA_CAMERA_SUPPORT > > visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT > > default y if CONFIG_MEDIA_EMBEDDED_SUPPORT > > > > config MEDIA_ANALOG_TV_SUPPORT > > visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT > > default y if CONFIG_MEDIA_EMBEDDED_SUPPORT > > > > config MEDIA_DIGITAL_TV_SUPPORT > > visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT > > default y if CONFIG_MEDIA_EMBEDDED_SUPPORT > > > > config MEDIA_RADIO_SUPPORT > > visible if !CONFIG_MEDIA_EMBEDDED_SUPPORT > > default y if CONFIG_MEDIA_EMBEDDED_SUPPORT > > > > Regards, > > Mauro > > > >> > >> diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig > >> index 3b9795cfcb36..9382e35211ca 100644 > >> --- a/drivers/media/mc/Kconfig > >> +++ b/drivers/media/mc/Kconfig > >> @@ -5,7 +5,6 @@ > >> > >> config MEDIA_CONTROLLER > >> bool "Media Controller API" > >> - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > >> help > >> Enable the media controller API used to query media devices internal > >> topology and configure it dynamically. > >> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > >> index f65e98d3adf2..dc5869dac5dc 100644 > >> --- a/drivers/media/platform/Kconfig > >> +++ b/drivers/media/platform/Kconfig > >> @@ -5,7 +5,6 @@ > >> > >> menuconfig V4L_PLATFORM_DRIVERS > >> bool "V4L platform devices" > >> - depends on MEDIA_CAMERA_SUPPORT > >> help > >> Say Y here to enable support for platform-specific V4L drivers. > >> > >> @@ -43,7 +42,6 @@ config VIDEO_ASPEED > >> > >> config VIDEO_SH_VOU > >> tristate "SuperH VOU video output driver" > >> - depends on MEDIA_CAMERA_SUPPORT > >> depends on VIDEO_DEV && I2C > >> depends on ARCH_SHMOBILE || COMPILE_TEST > >> select VIDEOBUF2_DMA_CONTIG > >> @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS > >> menuconfig V4L_MEM2MEM_DRIVERS > >> bool "Memory-to-memory multimedia devices" > >> depends on VIDEO_V4L2 > >> - depends on MEDIA_CAMERA_SUPPORT > >> help > >> Say Y here to enable selecting drivers for V4L devices that > >> use system memory for both source and destination buffers, as opposed > >> @@ -522,7 +519,6 @@ config VIDEO_TI_CSC > >> > >> menuconfig V4L_TEST_DRIVERS > >> bool "Media test drivers" > >> - depends on MEDIA_CAMERA_SUPPORT > >> > >> if V4L_TEST_DRIVERS > >> > >> > >> Cheers, > >> Ezequiel > >> > >>>> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > >>>> --- > >>>> drivers/media/Kconfig | 61 ---------------------------- > >>>> drivers/media/dvb-frontends/Kconfig | 2 +- > >>>> drivers/media/i2c/Kconfig | 14 +------ > >>>> drivers/media/i2c/m5mols/Kconfig | 1 - > >>>> drivers/media/i2c/smiapp/Kconfig | 1 - > >>>> drivers/media/mc/Kconfig | 1 - > >>>> drivers/media/pci/Kconfig | 18 ++------ > >>>> drivers/media/pci/bt8xx/Kconfig | 1 - > >>>> drivers/media/platform/Kconfig | 7 ---- > >>>> drivers/media/radio/Kconfig | 1 - > >>>> drivers/media/tuners/Kconfig | 8 ++-- > >>>> drivers/media/usb/Kconfig | 29 ++++--------- > >>>> drivers/media/usb/dvb-usb-v2/Kconfig | 2 +- > >>>> drivers/media/usb/em28xx/Kconfig | 4 +- > >>>> drivers/media/usb/go7007/Kconfig | 2 +- > >>>> sound/pci/Kconfig | 2 - > >>>> 16 files changed, 20 insertions(+), 134 deletions(-) > >>>> > >>>> diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig > >>>> index 9dfea5c4b6ab..fcbf265a92cd 100644 > >>>> --- a/drivers/media/Kconfig > >>>> +++ b/drivers/media/Kconfig > >>>> @@ -30,63 +30,6 @@ comment "Multimedia core support" > >>>> # > >>>> # Multimedia support - automatically enable V4L2 and DVB core > >>>> # > >>>> -config MEDIA_CAMERA_SUPPORT > >>>> - bool "Cameras/video grabbers support" > >>>> - help > >>>> - Enable support for webcams and video grabbers. > >>>> - > >>>> - Say Y when you have a webcam or a video capture grabber board. > >>>> - > >>>> -config MEDIA_ANALOG_TV_SUPPORT > >>>> - bool "Analog TV support" > >>>> - help > >>>> - Enable analog TV support. > >>>> - > >>>> - Say Y when you have a TV board with analog support or with a > >>>> - hybrid analog/digital TV chipset. > >>>> - > >>>> - Note: There are several DVB cards that are based on chips that > >>>> - support both analog and digital TV. Disabling this option > >>>> - will disable support for them. > >>>> - > >>>> -config MEDIA_DIGITAL_TV_SUPPORT > >>>> - bool "Digital TV support" > >>>> - help > >>>> - Enable digital TV support. > >>>> - > >>>> - Say Y when you have a board with digital support or a board with > >>>> - hybrid digital TV and analog TV. > >>>> - > >>>> -config MEDIA_RADIO_SUPPORT > >>>> - bool "AM/FM radio receivers/transmitters support" > >>>> - help > >>>> - Enable AM/FM radio support. > >>>> - > >>>> - Additional info and docs are available on the web at > >>>> - <https://linuxtv.org> > >>>> - > >>>> - Say Y when you have a board with radio support. > >>>> - > >>>> - Note: There are several TV cards that are based on chips that > >>>> - support radio reception. Disabling this option will > >>>> - disable support for them. > >>>> - > >>>> -config MEDIA_SDR_SUPPORT > >>>> - bool "Software defined radio support" > >>>> - help > >>>> - Enable software defined radio support. > >>>> - > >>>> - Say Y when you have a software defined radio device. > >>>> - > >>>> -config MEDIA_CEC_SUPPORT > >>>> - bool "HDMI CEC support" > >>>> - help > >>>> - Enable support for HDMI CEC (Consumer Electronics Control), > >>>> - which is an optional HDMI feature. > >>>> - > >>>> - Say Y when you have an HDMI receiver, transmitter or a USB CEC > >>>> - adapter that supports HDMI CEC. > >>>> - > >>>> source "drivers/media/cec/Kconfig" > >>>> > >>>> source "drivers/media/mc/Kconfig" > >>>> @@ -99,7 +42,6 @@ source "drivers/media/mc/Kconfig" > >>>> config VIDEO_DEV > >>>> tristate > >>>> depends on MEDIA_SUPPORT > >>>> - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > >>>> default y > >>>> > >>>> config VIDEO_V4L2_SUBDEV_API > >>>> @@ -121,7 +63,6 @@ source "drivers/media/v4l2-core/Kconfig" > >>>> config DVB_CORE > >>>> tristate > >>>> depends on MEDIA_SUPPORT > >>>> - depends on MEDIA_DIGITAL_TV_SUPPORT > >>>> depends on (I2C || I2C=n) > >>>> default y > >>>> select CRC32 > >>>> @@ -186,7 +127,6 @@ comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" > >>>> > >>>> config MEDIA_SUBDRV_AUTOSELECT > >>>> bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" > >>>> - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT > >>>> depends on HAS_IOMEM > >>>> select I2C > >>>> select I2C_MUX > >>>> @@ -214,7 +154,6 @@ config MEDIA_HIDE_ANCILLARY_SUBDRV > >>>> > >>>> config MEDIA_ATTACH > >>>> bool > >>>> - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT > >>>> depends on MODULES > >>>> default MODULES > >>>> > >>>> diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig > >>>> index a29e9ddf9c82..832f66b91459 100644 > >>>> --- a/drivers/media/dvb-frontends/Kconfig > >>>> +++ b/drivers/media/dvb-frontends/Kconfig > >>>> @@ -518,7 +518,7 @@ config DVB_RTL2832 > >>>> > >>>> config DVB_RTL2832_SDR > >>>> tristate "Realtek RTL2832 SDR" > >>>> - depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && MEDIA_SDR_SUPPORT && USB > >>>> + depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && USB > >>>> select DVB_RTL2832 > >>>> select VIDEOBUF2_VMALLOC > >>>> default m if !MEDIA_SUBDRV_AUTOSELECT > >>>> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig > >>>> index 125d596c13dd..92e51c288321 100644 > >>>> --- a/drivers/media/i2c/Kconfig > >>>> +++ b/drivers/media/i2c/Kconfig > >>>> @@ -568,8 +568,6 @@ config VIDEO_APTINA_PLL > >>>> config VIDEO_SMIAPP_PLL > >>>> tristate > >>>> > >>>> -if MEDIA_CAMERA_SUPPORT > >>>> - > >>>> config VIDEO_HI556 > >>>> tristate "Hynix Hi-556 sensor support" > >>>> depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > >>>> @@ -1007,12 +1005,9 @@ config VIDEO_S5C73M3 > >>>> help > >>>> This is a V4L2 sensor driver for Samsung S5C73M3 > >>>> 8 Mpixel camera. > >>>> -endif > >>>> > >>>> comment "Lens drivers" > >>>> > >>>> -if MEDIA_CAMERA_SUPPORT > >>>> - > >>>> config VIDEO_AD5820 > >>>> tristate "AD5820 lens voice coil support" > >>>> depends on GPIOLIB && I2C && VIDEO_V4L2 && MEDIA_CONTROLLER > >>>> @@ -1050,12 +1045,8 @@ config VIDEO_DW9807_VCM > >>>> capability. This is designed for linear control of > >>>> voice coil motors, controlled via I2C serial interface. > >>>> > >>>> -endif > >>>> - > >>>> comment "Flash devices" > >>>> > >>>> -if MEDIA_CAMERA_SUPPORT > >>>> - > >>>> config VIDEO_ADP1653 > >>>> tristate "ADP1653 flash support" > >>>> depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER > >>>> @@ -1079,8 +1070,6 @@ config VIDEO_LM3646 > >>>> This is a driver for the lm3646 dual flash controllers. It controls > >>>> flash, torch LEDs. > >>>> > >>>> -endif > >>>> - > >>>> comment "Video improvement chips" > >>>> > >>>> config VIDEO_UPD64031A > >>>> @@ -1123,7 +1112,7 @@ comment "SDR tuner chips" > >>>> > >>>> config SDR_MAX2175 > >>>> tristate "Maxim 2175 RF to Bits tuner" > >>>> - depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C > >>>> + depends on VIDEO_V4L2 && I2C > >>>> select REGMAP_I2C > >>>> help > >>>> Support for Maxim 2175 tuner. It is an advanced analog/digital > >>>> @@ -1169,7 +1158,6 @@ config VIDEO_I2C > >>>> config VIDEO_ST_MIPID02 > >>>> tristate "STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge" > >>>> depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > >>>> - depends on MEDIA_CAMERA_SUPPORT > >>>> select V4L2_FWNODE > >>>> help > >>>> Support for STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge. > >>>> diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kconfig > >>>> index e573482f269f..91c0dafc7668 100644 > >>>> --- a/drivers/media/i2c/m5mols/Kconfig > >>>> +++ b/drivers/media/i2c/m5mols/Kconfig > >>>> @@ -2,6 +2,5 @@ > >>>> config VIDEO_M5MOLS > >>>> tristate "Fujitsu M-5MOLS 8MP sensor support" > >>>> depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > >>>> - depends on MEDIA_CAMERA_SUPPORT > >>>> help > >>>> This driver supports Fujitsu M-5MOLS camera sensor with ISP > >>>> diff --git a/drivers/media/i2c/smiapp/Kconfig b/drivers/media/i2c/smiapp/Kconfig > >>>> index fcaa7f9494a8..a2f5775dfcac 100644 > >>>> --- a/drivers/media/i2c/smiapp/Kconfig > >>>> +++ b/drivers/media/i2c/smiapp/Kconfig > >>>> @@ -2,7 +2,6 @@ > >>>> config VIDEO_SMIAPP > >>>> tristate "SMIA++/SMIA sensor support" > >>>> depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK > >>>> - depends on MEDIA_CAMERA_SUPPORT > >>>> select VIDEO_SMIAPP_PLL > >>>> select V4L2_FWNODE > >>>> help > >>>> diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig > >>>> index 3b9795cfcb36..9382e35211ca 100644 > >>>> --- a/drivers/media/mc/Kconfig > >>>> +++ b/drivers/media/mc/Kconfig > >>>> @@ -5,7 +5,6 @@ > >>>> > >>>> config MEDIA_CONTROLLER > >>>> bool "Media Controller API" > >>>> - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > >>>> help > >>>> Enable the media controller API used to query media devices internal > >>>> topology and configure it dynamically. > >>>> diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig > >>>> index dcb3719f440e..3d2cc135acd6 100644 > >>>> --- a/drivers/media/pci/Kconfig > >>>> +++ b/drivers/media/pci/Kconfig > >>>> @@ -9,25 +9,20 @@ menuconfig MEDIA_PCI_SUPPORT > >>>> > >>>> if MEDIA_PCI_SUPPORT > >>>> > >>>> -if MEDIA_CAMERA_SUPPORT > >>>> - comment "Media capture support" > >>>> +comment "Media capture support" > >>>> source "drivers/media/pci/meye/Kconfig" > >>>> source "drivers/media/pci/solo6x10/Kconfig" > >>>> source "drivers/media/pci/sta2x11/Kconfig" > >>>> source "drivers/media/pci/tw5864/Kconfig" > >>>> source "drivers/media/pci/tw68/Kconfig" > >>>> source "drivers/media/pci/tw686x/Kconfig" > >>>> -endif > >>>> > >>>> -if MEDIA_ANALOG_TV_SUPPORT > >>>> - comment "Media capture/analog TV support" > >>>> +comment "Media capture/analog TV support" > >>>> source "drivers/media/pci/ivtv/Kconfig" > >>>> source "drivers/media/pci/saa7146/Kconfig" > >>>> source "drivers/media/pci/dt3155/Kconfig" > >>>> -endif > >>>> > >>>> -if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT > >>>> - comment "Media capture/analog/hybrid TV support" > >>>> +comment "Media capture/analog/hybrid TV support" > >>>> source "drivers/media/pci/cx18/Kconfig" > >>>> source "drivers/media/pci/cx23885/Kconfig" > >>>> source "drivers/media/pci/cx25821/Kconfig" > >>>> @@ -37,10 +32,7 @@ source "drivers/media/pci/saa7134/Kconfig" > >>>> source "drivers/media/pci/saa7164/Kconfig" > >>>> source "drivers/media/pci/cobalt/Kconfig" > >>>> > >>>> -endif > >>>> - > >>>> -if MEDIA_DIGITAL_TV_SUPPORT > >>>> - comment "Media digital TV PCI Adapters" > >>>> +comment "Media digital TV PCI Adapters" > >>>> source "drivers/media/pci/ttpci/Kconfig" > >>>> source "drivers/media/pci/b2c2/Kconfig" > >>>> source "drivers/media/pci/pluto2/Kconfig" > >>>> @@ -52,8 +44,6 @@ source "drivers/media/pci/ngene/Kconfig" > >>>> source "drivers/media/pci/ddbridge/Kconfig" > >>>> source "drivers/media/pci/smipcie/Kconfig" > >>>> source "drivers/media/pci/netup_unidvb/Kconfig" > >>>> -endif > >>>> - > >>>> source "drivers/media/pci/intel/ipu3/Kconfig" > >>>> > >>>> endif #MEDIA_PCI_SUPPORT > >>>> diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig > >>>> index 75d172a6f54c..a4522c35d606 100644 > >>>> --- a/drivers/media/pci/bt8xx/Kconfig > >>>> +++ b/drivers/media/pci/bt8xx/Kconfig > >>>> @@ -5,7 +5,6 @@ config VIDEO_BT848 > >>>> select I2C_ALGOBIT > >>>> select VIDEOBUF_DMA_SG > >>>> depends on RC_CORE > >>>> - depends on MEDIA_RADIO_SUPPORT > >>>> select VIDEO_TUNER > >>>> select VIDEO_TVEEPROM > >>>> select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT > >>>> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > >>>> index e01bbb9dd1c1..6d48338e8100 100644 > >>>> --- a/drivers/media/platform/Kconfig > >>>> +++ b/drivers/media/platform/Kconfig > >>>> @@ -5,7 +5,6 @@ > >>>> > >>>> menuconfig V4L_PLATFORM_DRIVERS > >>>> bool "V4L platform devices" > >>>> - depends on MEDIA_CAMERA_SUPPORT > >>>> help > >>>> Say Y here to enable support for platform-specific V4L drivers. > >>>> > >>>> @@ -43,7 +42,6 @@ config VIDEO_ASPEED > >>>> > >>>> config VIDEO_SH_VOU > >>>> tristate "SuperH VOU video output driver" > >>>> - depends on MEDIA_CAMERA_SUPPORT > >>>> depends on VIDEO_DEV && I2C > >>>> depends on ARCH_SHMOBILE || COMPILE_TEST > >>>> select VIDEOBUF2_DMA_CONTIG > >>>> @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS > >>>> menuconfig V4L_MEM2MEM_DRIVERS > >>>> bool "Memory-to-memory multimedia devices" > >>>> depends on VIDEO_V4L2 > >>>> - depends on MEDIA_CAMERA_SUPPORT > >>>> help > >>>> Say Y here to enable selecting drivers for V4L devices that > >>>> use system memory for both source and destination buffers, as opposed > >>>> @@ -534,7 +531,6 @@ config VIDEO_TI_CSC > >>>> > >>>> menuconfig V4L_TEST_DRIVERS > >>>> bool "Media test drivers" > >>>> - depends on MEDIA_CAMERA_SUPPORT > >>>> > >>>> if V4L_TEST_DRIVERS > >>>> > >>>> @@ -557,7 +553,6 @@ endif #V4L_TEST_DRIVERS > >>>> > >>>> menuconfig DVB_PLATFORM_DRIVERS > >>>> bool "DVB platform devices" > >>>> - depends on MEDIA_DIGITAL_TV_SUPPORT > >>>> help > >>>> Say Y here to enable support for platform-specific Digital TV drivers. > >>>> > >>>> @@ -567,7 +562,6 @@ endif #DVB_PLATFORM_DRIVERS > >>>> > >>>> menuconfig CEC_PLATFORM_DRIVERS > >>>> bool "CEC platform devices" > >>>> - depends on MEDIA_CEC_SUPPORT > >>>> > >>>> if CEC_PLATFORM_DRIVERS > >>>> > >>>> @@ -692,7 +686,6 @@ endif #CEC_PLATFORM_DRIVERS > >>>> > >>>> menuconfig SDR_PLATFORM_DRIVERS > >>>> bool "SDR platform devices" > >>>> - depends on MEDIA_SDR_SUPPORT > >>>> help > >>>> Say Y here to enable support for platform-specific SDR Drivers. > >>>> > >>>> diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig > >>>> index eb79d99787bd..e19ba6ab6e48 100644 > >>>> --- a/drivers/media/radio/Kconfig > >>>> +++ b/drivers/media/radio/Kconfig > >>>> @@ -6,7 +6,6 @@ > >>>> menuconfig RADIO_ADAPTERS > >>>> bool "Radio Adapters" > >>>> depends on VIDEO_V4L2 > >>>> - depends on MEDIA_RADIO_SUPPORT > >>>> default y > >>>> help > >>>> Say Y here to enable selecting AM/FM radio adapters. > >>>> diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig > >>>> index e104bb7766e1..7af7ff174eea 100644 > >>>> --- a/drivers/media/tuners/Kconfig > >>>> +++ b/drivers/media/tuners/Kconfig > >>>> @@ -2,26 +2,24 @@ > >>>> # Analog TV tuners, auto-loaded via tuner.ko > >>>> config MEDIA_TUNER > >>>> tristate > >>>> - depends on (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT) && I2C > >>>> + depends on I2C > >>>> default y > >>>> select MEDIA_TUNER_XC2028 if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_XC4000 if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_MT20XX if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT > >>>> - select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT > >>>> - select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT > >>>> + select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT > >>>> + select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT > >>>> > >>>> comment "Tuner drivers hidden by 'Autoselect ancillary drivers'" > >>>> depends on MEDIA_HIDE_ANCILLARY_SUBDRV > >>>> - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > >>>> > >>>> menu "Customize TV tuners" > >>>> visible if !MEDIA_HIDE_ANCILLARY_SUBDRV > >>>> - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT > >>>> > >>>> config MEDIA_TUNER_SIMPLE > >>>> tristate "Simple tuner support" > >>>> diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig > >>>> index e678d3d11467..72c88b1add55 100644 > >>>> --- a/drivers/media/usb/Kconfig > >>>> +++ b/drivers/media/usb/Kconfig > >>>> @@ -9,8 +9,7 @@ menuconfig MEDIA_USB_SUPPORT > >>>> > >>>> if MEDIA_USB_SUPPORT > >>>> > >>>> -if MEDIA_CAMERA_SUPPORT > >>>> - comment "Webcam devices" > >>>> +comment "Webcam devices" > >>>> source "drivers/media/usb/uvc/Kconfig" > >>>> source "drivers/media/usb/gspca/Kconfig" > >>>> source "drivers/media/usb/pwc/Kconfig" > >>>> @@ -19,26 +18,19 @@ source "drivers/media/usb/zr364xx/Kconfig" > >>>> source "drivers/media/usb/stkwebcam/Kconfig" > >>>> source "drivers/media/usb/s2255/Kconfig" > >>>> source "drivers/media/usb/usbtv/Kconfig" > >>>> -endif > >>>> > >>>> -if MEDIA_ANALOG_TV_SUPPORT > >>>> - comment "Analog TV USB devices" > >>>> +comment "Analog TV USB devices" > >>>> source "drivers/media/usb/pvrusb2/Kconfig" > >>>> source "drivers/media/usb/hdpvr/Kconfig" > >>>> source "drivers/media/usb/stk1160/Kconfig" > >>>> source "drivers/media/usb/go7007/Kconfig" > >>>> -endif > >>>> > >>>> -if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) > >>>> - comment "Analog/digital TV USB devices" > >>>> +comment "Analog/digital TV USB devices" > >>>> source "drivers/media/usb/au0828/Kconfig" > >>>> source "drivers/media/usb/cx231xx/Kconfig" > >>>> source "drivers/media/usb/tm6000/Kconfig" > >>>> -endif > >>>> > >>>> - > >>>> -if I2C && MEDIA_DIGITAL_TV_SUPPORT > >>>> - comment "Digital TV USB devices" > >>>> +comment "Digital TV USB devices" > >>>> source "drivers/media/usb/dvb-usb/Kconfig" > >>>> source "drivers/media/usb/dvb-usb-v2/Kconfig" > >>>> source "drivers/media/usb/ttusb-budget/Kconfig" > >>>> @@ -46,25 +38,18 @@ source "drivers/media/usb/ttusb-dec/Kconfig" > >>>> source "drivers/media/usb/siano/Kconfig" > >>>> source "drivers/media/usb/b2c2/Kconfig" > >>>> source "drivers/media/usb/as102/Kconfig" > >>>> -endif > >>>> > >>>> -if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) > >>>> - comment "Webcam, TV (analog/digital) USB devices" > >>>> +comment "Webcam, TV (analog/digital) USB devices" > >>>> source "drivers/media/usb/em28xx/Kconfig" > >>>> -endif > >>>> > >>>> -if MEDIA_SDR_SUPPORT > >>>> - comment "Software defined radio USB devices" > >>>> +comment "Software defined radio USB devices" > >>>> source "drivers/media/usb/airspy/Kconfig" > >>>> source "drivers/media/usb/hackrf/Kconfig" > >>>> source "drivers/media/usb/msi2500/Kconfig" > >>>> -endif > >>>> > >>>> -if MEDIA_CEC_SUPPORT > >>>> - comment "USB HDMI CEC adapters" > >>>> +comment "USB HDMI CEC adapters" > >>>> source "drivers/media/usb/pulse8-cec/Kconfig" > >>>> source "drivers/media/usb/rainshadow-cec/Kconfig" > >>>> -endif > >>>> > >>>> endif #MEDIA_USB_SUPPORT > >>>> endif #USB > >>>> diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig > >>>> index b21a4d413872..8ebda4361b65 100644 > >>>> --- a/drivers/media/usb/dvb-usb-v2/Kconfig > >>>> +++ b/drivers/media/usb/dvb-usb-v2/Kconfig > >>>> @@ -137,7 +137,7 @@ config DVB_USB_RTL28XXU > >>>> select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT > >>>> select DVB_RTL2830 > >>>> select DVB_RTL2832 > >>>> - select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT) > >>>> + select DVB_RTL2832_SDR if MEDIA_SUBDRV_AUTOSELECT > >>>> select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_E4000 if MEDIA_SUBDRV_AUTOSELECT > >>>> select MEDIA_TUNER_FC0012 if MEDIA_SUBDRV_AUTOSELECT > >>>> diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig > >>>> index f2031a933e54..7031d6e80304 100644 > >>>> --- a/drivers/media/usb/em28xx/Kconfig > >>>> +++ b/drivers/media/usb/em28xx/Kconfig > >>>> @@ -12,8 +12,8 @@ config VIDEO_EM28XX_V4L2 > >>>> select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT > >>>> select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT > >>>> select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT > >>>> - select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > >>>> - select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > >>>> + select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT > >>>> + select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT > >>>> help > >>>> This is a video4linux driver for Empia 28xx based TV cards. > >>>> > >>>> diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig > >>>> index 4ff79940ad8d..533e95375082 100644 > >>>> --- a/drivers/media/usb/go7007/Kconfig > >>>> +++ b/drivers/media/usb/go7007/Kconfig > >>>> @@ -12,7 +12,7 @@ config VIDEO_GO7007 > >>>> select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT > >>>> select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT > >>>> select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT > >>>> - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT > >>>> + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT > >>>> select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT > >>>> help > >>>> This is a video4linux driver for the WIS GO7007 MPEG > >>>> diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig > >>>> index 93bc9bef7641..e68af4112505 100644 > >>>> --- a/sound/pci/Kconfig > >>>> +++ b/sound/pci/Kconfig > >>>> @@ -557,7 +557,6 @@ config SND_ES1968_INPUT > >>>> config SND_ES1968_RADIO > >>>> bool "Enable TEA5757 radio tuner support for es1968" > >>>> depends on SND_ES1968 > >>>> - depends on MEDIA_RADIO_SUPPORT > >>>> depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 > >>>> select RADIO_ADAPTERS > >>>> select RADIO_TEA575X > >>>> @@ -581,7 +580,6 @@ config SND_FM801 > >>>> config SND_FM801_TEA575X_BOOL > >>>> bool "ForteMedia FM801 + TEA5757 tuner" > >>>> depends on SND_FM801 > >>>> - depends on MEDIA_RADIO_SUPPORT > >>>> depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 > >>>> select RADIO_ADAPTERS > >>>> select RADIO_TEA575X > >>> > >>> > >>> Thanks, > >>> Mauro > >> > >> > > > > > > > > Thanks, > > Mauro > >
Hi Ezequiel,
I love your patch! Yet something to improve:
[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on sound/for-next linux/master linus/master v5.6-rc7 next-20200325]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Ezequiel-Garcia/media-Refactor-configuration-options/20200321-150418
base: git://linuxtv.org/media_tree.git master
config: sh-randconfig-a001-20200325 (attached as .config)
compiler: sh4-linux-gcc (GCC) 9.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=9.2.0 make.cross ARCH=sh
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
sh4-linux-objcopy: Unable to change endianness of input file(s)
>> sh4-linux-ld: cannot find drivers/media/tuners/.tmp_gl_mt20xx.o: No such file or directory
>> sh4-linux-objcopy: 'drivers/media/tuners/.tmp_mx_mt20xx.o': No such file
rm: cannot remove 'drivers/media/tuners/.tmp_gl_mt20xx.o': No such file or directory
rm: cannot remove 'drivers/media/tuners/.tmp_mx_mt20xx.o': No such file or directory
--
sh4-linux-objcopy: Unable to change endianness of input file(s)
>> sh4-linux-ld: cannot find drivers/media/tuners/.tmp_gl_tda8290.o: No such file or directory
>> sh4-linux-objcopy: 'drivers/media/tuners/.tmp_mx_tda8290.o': No such file
rm: cannot remove 'drivers/media/tuners/.tmp_gl_tda8290.o': No such file or directory
rm: cannot remove 'drivers/media/tuners/.tmp_mx_tda8290.o': No such file or directory
--
sh4-linux-objcopy: Unable to change endianness of input file(s)
>> sh4-linux-ld: cannot find drivers/media/tuners/.tmp_gl_tda9887.o: No such file or directory
>> sh4-linux-objcopy: 'drivers/media/tuners/.tmp_mx_tda9887.o': No such file
rm: cannot remove 'drivers/media/tuners/.tmp_gl_tda9887.o': No such file or directory
rm: cannot remove 'drivers/media/tuners/.tmp_mx_tda9887.o': No such file or directory
--
sh4-linux-objcopy: Unable to change endianness of input file(s)
>> sh4-linux-ld: cannot find drivers/media/tuners/.tmp_gl_tda18271-fe.o: No such file or directory
>> sh4-linux-objcopy: 'drivers/media/tuners/.tmp_mx_tda18271-fe.o': No such file
rm: cannot remove 'drivers/media/tuners/.tmp_gl_tda18271-fe.o': No such file or directory
rm: cannot remove 'drivers/media/tuners/.tmp_mx_tda18271-fe.o': No such file or directory
--
>> sh4-linux-ld: cannot find drivers/media/tuners/tda18271-fe.o: No such file or directory
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 9dfea5c4b6ab..fcbf265a92cd 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -30,63 +30,6 @@ comment "Multimedia core support" # # Multimedia support - automatically enable V4L2 and DVB core # -config MEDIA_CAMERA_SUPPORT - bool "Cameras/video grabbers support" - help - Enable support for webcams and video grabbers. - - Say Y when you have a webcam or a video capture grabber board. - -config MEDIA_ANALOG_TV_SUPPORT - bool "Analog TV support" - help - Enable analog TV support. - - Say Y when you have a TV board with analog support or with a - hybrid analog/digital TV chipset. - - Note: There are several DVB cards that are based on chips that - support both analog and digital TV. Disabling this option - will disable support for them. - -config MEDIA_DIGITAL_TV_SUPPORT - bool "Digital TV support" - help - Enable digital TV support. - - Say Y when you have a board with digital support or a board with - hybrid digital TV and analog TV. - -config MEDIA_RADIO_SUPPORT - bool "AM/FM radio receivers/transmitters support" - help - Enable AM/FM radio support. - - Additional info and docs are available on the web at - <https://linuxtv.org> - - Say Y when you have a board with radio support. - - Note: There are several TV cards that are based on chips that - support radio reception. Disabling this option will - disable support for them. - -config MEDIA_SDR_SUPPORT - bool "Software defined radio support" - help - Enable software defined radio support. - - Say Y when you have a software defined radio device. - -config MEDIA_CEC_SUPPORT - bool "HDMI CEC support" - help - Enable support for HDMI CEC (Consumer Electronics Control), - which is an optional HDMI feature. - - Say Y when you have an HDMI receiver, transmitter or a USB CEC - adapter that supports HDMI CEC. - source "drivers/media/cec/Kconfig" source "drivers/media/mc/Kconfig" @@ -99,7 +42,6 @@ source "drivers/media/mc/Kconfig" config VIDEO_DEV tristate depends on MEDIA_SUPPORT - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT default y config VIDEO_V4L2_SUBDEV_API @@ -121,7 +63,6 @@ source "drivers/media/v4l2-core/Kconfig" config DVB_CORE tristate depends on MEDIA_SUPPORT - depends on MEDIA_DIGITAL_TV_SUPPORT depends on (I2C || I2C=n) default y select CRC32 @@ -186,7 +127,6 @@ comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" config MEDIA_SUBDRV_AUTOSELECT bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT depends on HAS_IOMEM select I2C select I2C_MUX @@ -214,7 +154,6 @@ config MEDIA_HIDE_ANCILLARY_SUBDRV config MEDIA_ATTACH bool - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT depends on MODULES default MODULES diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig index a29e9ddf9c82..832f66b91459 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -518,7 +518,7 @@ config DVB_RTL2832 config DVB_RTL2832_SDR tristate "Realtek RTL2832 SDR" - depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && MEDIA_SDR_SUPPORT && USB + depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && USB select DVB_RTL2832 select VIDEOBUF2_VMALLOC default m if !MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 125d596c13dd..92e51c288321 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -568,8 +568,6 @@ config VIDEO_APTINA_PLL config VIDEO_SMIAPP_PLL tristate -if MEDIA_CAMERA_SUPPORT - config VIDEO_HI556 tristate "Hynix Hi-556 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API @@ -1007,12 +1005,9 @@ config VIDEO_S5C73M3 help This is a V4L2 sensor driver for Samsung S5C73M3 8 Mpixel camera. -endif comment "Lens drivers" -if MEDIA_CAMERA_SUPPORT - config VIDEO_AD5820 tristate "AD5820 lens voice coil support" depends on GPIOLIB && I2C && VIDEO_V4L2 && MEDIA_CONTROLLER @@ -1050,12 +1045,8 @@ config VIDEO_DW9807_VCM capability. This is designed for linear control of voice coil motors, controlled via I2C serial interface. -endif - comment "Flash devices" -if MEDIA_CAMERA_SUPPORT - config VIDEO_ADP1653 tristate "ADP1653 flash support" depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER @@ -1079,8 +1070,6 @@ config VIDEO_LM3646 This is a driver for the lm3646 dual flash controllers. It controls flash, torch LEDs. -endif - comment "Video improvement chips" config VIDEO_UPD64031A @@ -1123,7 +1112,7 @@ comment "SDR tuner chips" config SDR_MAX2175 tristate "Maxim 2175 RF to Bits tuner" - depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C + depends on VIDEO_V4L2 && I2C select REGMAP_I2C help Support for Maxim 2175 tuner. It is an advanced analog/digital @@ -1169,7 +1158,6 @@ config VIDEO_I2C config VIDEO_ST_MIPID02 tristate "STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - depends on MEDIA_CAMERA_SUPPORT select V4L2_FWNODE help Support for STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge. diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kconfig index e573482f269f..91c0dafc7668 100644 --- a/drivers/media/i2c/m5mols/Kconfig +++ b/drivers/media/i2c/m5mols/Kconfig @@ -2,6 +2,5 @@ config VIDEO_M5MOLS tristate "Fujitsu M-5MOLS 8MP sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - depends on MEDIA_CAMERA_SUPPORT help This driver supports Fujitsu M-5MOLS camera sensor with ISP diff --git a/drivers/media/i2c/smiapp/Kconfig b/drivers/media/i2c/smiapp/Kconfig index fcaa7f9494a8..a2f5775dfcac 100644 --- a/drivers/media/i2c/smiapp/Kconfig +++ b/drivers/media/i2c/smiapp/Kconfig @@ -2,7 +2,6 @@ config VIDEO_SMIAPP tristate "SMIA++/SMIA sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK - depends on MEDIA_CAMERA_SUPPORT select VIDEO_SMIAPP_PLL select V4L2_FWNODE help diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig index 3b9795cfcb36..9382e35211ca 100644 --- a/drivers/media/mc/Kconfig +++ b/drivers/media/mc/Kconfig @@ -5,7 +5,6 @@ config MEDIA_CONTROLLER bool "Media Controller API" - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT help Enable the media controller API used to query media devices internal topology and configure it dynamically. diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig index dcb3719f440e..3d2cc135acd6 100644 --- a/drivers/media/pci/Kconfig +++ b/drivers/media/pci/Kconfig @@ -9,25 +9,20 @@ menuconfig MEDIA_PCI_SUPPORT if MEDIA_PCI_SUPPORT -if MEDIA_CAMERA_SUPPORT - comment "Media capture support" +comment "Media capture support" source "drivers/media/pci/meye/Kconfig" source "drivers/media/pci/solo6x10/Kconfig" source "drivers/media/pci/sta2x11/Kconfig" source "drivers/media/pci/tw5864/Kconfig" source "drivers/media/pci/tw68/Kconfig" source "drivers/media/pci/tw686x/Kconfig" -endif -if MEDIA_ANALOG_TV_SUPPORT - comment "Media capture/analog TV support" +comment "Media capture/analog TV support" source "drivers/media/pci/ivtv/Kconfig" source "drivers/media/pci/saa7146/Kconfig" source "drivers/media/pci/dt3155/Kconfig" -endif -if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT - comment "Media capture/analog/hybrid TV support" +comment "Media capture/analog/hybrid TV support" source "drivers/media/pci/cx18/Kconfig" source "drivers/media/pci/cx23885/Kconfig" source "drivers/media/pci/cx25821/Kconfig" @@ -37,10 +32,7 @@ source "drivers/media/pci/saa7134/Kconfig" source "drivers/media/pci/saa7164/Kconfig" source "drivers/media/pci/cobalt/Kconfig" -endif - -if MEDIA_DIGITAL_TV_SUPPORT - comment "Media digital TV PCI Adapters" +comment "Media digital TV PCI Adapters" source "drivers/media/pci/ttpci/Kconfig" source "drivers/media/pci/b2c2/Kconfig" source "drivers/media/pci/pluto2/Kconfig" @@ -52,8 +44,6 @@ source "drivers/media/pci/ngene/Kconfig" source "drivers/media/pci/ddbridge/Kconfig" source "drivers/media/pci/smipcie/Kconfig" source "drivers/media/pci/netup_unidvb/Kconfig" -endif - source "drivers/media/pci/intel/ipu3/Kconfig" endif #MEDIA_PCI_SUPPORT diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig index 75d172a6f54c..a4522c35d606 100644 --- a/drivers/media/pci/bt8xx/Kconfig +++ b/drivers/media/pci/bt8xx/Kconfig @@ -5,7 +5,6 @@ config VIDEO_BT848 select I2C_ALGOBIT select VIDEOBUF_DMA_SG depends on RC_CORE - depends on MEDIA_RADIO_SUPPORT select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index e01bbb9dd1c1..6d48338e8100 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -5,7 +5,6 @@ menuconfig V4L_PLATFORM_DRIVERS bool "V4L platform devices" - depends on MEDIA_CAMERA_SUPPORT help Say Y here to enable support for platform-specific V4L drivers. @@ -43,7 +42,6 @@ config VIDEO_ASPEED config VIDEO_SH_VOU tristate "SuperH VOU video output driver" - depends on MEDIA_CAMERA_SUPPORT depends on VIDEO_DEV && I2C depends on ARCH_SHMOBILE || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -165,7 +163,6 @@ endif # V4L_PLATFORM_DRIVERS menuconfig V4L_MEM2MEM_DRIVERS bool "Memory-to-memory multimedia devices" depends on VIDEO_V4L2 - depends on MEDIA_CAMERA_SUPPORT help Say Y here to enable selecting drivers for V4L devices that use system memory for both source and destination buffers, as opposed @@ -534,7 +531,6 @@ config VIDEO_TI_CSC menuconfig V4L_TEST_DRIVERS bool "Media test drivers" - depends on MEDIA_CAMERA_SUPPORT if V4L_TEST_DRIVERS @@ -557,7 +553,6 @@ endif #V4L_TEST_DRIVERS menuconfig DVB_PLATFORM_DRIVERS bool "DVB platform devices" - depends on MEDIA_DIGITAL_TV_SUPPORT help Say Y here to enable support for platform-specific Digital TV drivers. @@ -567,7 +562,6 @@ endif #DVB_PLATFORM_DRIVERS menuconfig CEC_PLATFORM_DRIVERS bool "CEC platform devices" - depends on MEDIA_CEC_SUPPORT if CEC_PLATFORM_DRIVERS @@ -692,7 +686,6 @@ endif #CEC_PLATFORM_DRIVERS menuconfig SDR_PLATFORM_DRIVERS bool "SDR platform devices" - depends on MEDIA_SDR_SUPPORT help Say Y here to enable support for platform-specific SDR Drivers. diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index eb79d99787bd..e19ba6ab6e48 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -6,7 +6,6 @@ menuconfig RADIO_ADAPTERS bool "Radio Adapters" depends on VIDEO_V4L2 - depends on MEDIA_RADIO_SUPPORT default y help Say Y here to enable selecting AM/FM radio adapters. diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig index e104bb7766e1..7af7ff174eea 100644 --- a/drivers/media/tuners/Kconfig +++ b/drivers/media/tuners/Kconfig @@ -2,26 +2,24 @@ # Analog TV tuners, auto-loaded via tuner.ko config MEDIA_TUNER tristate - depends on (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT) && I2C + depends on I2C default y select MEDIA_TUNER_XC2028 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_XC4000 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MT20XX if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT - select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT - select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT + select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT + select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT comment "Tuner drivers hidden by 'Autoselect ancillary drivers'" depends on MEDIA_HIDE_ANCILLARY_SUBDRV - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT menu "Customize TV tuners" visible if !MEDIA_HIDE_ANCILLARY_SUBDRV - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT config MEDIA_TUNER_SIMPLE tristate "Simple tuner support" diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index e678d3d11467..72c88b1add55 100644 --- a/drivers/media/usb/Kconfig +++ b/drivers/media/usb/Kconfig @@ -9,8 +9,7 @@ menuconfig MEDIA_USB_SUPPORT if MEDIA_USB_SUPPORT -if MEDIA_CAMERA_SUPPORT - comment "Webcam devices" +comment "Webcam devices" source "drivers/media/usb/uvc/Kconfig" source "drivers/media/usb/gspca/Kconfig" source "drivers/media/usb/pwc/Kconfig" @@ -19,26 +18,19 @@ source "drivers/media/usb/zr364xx/Kconfig" source "drivers/media/usb/stkwebcam/Kconfig" source "drivers/media/usb/s2255/Kconfig" source "drivers/media/usb/usbtv/Kconfig" -endif -if MEDIA_ANALOG_TV_SUPPORT - comment "Analog TV USB devices" +comment "Analog TV USB devices" source "drivers/media/usb/pvrusb2/Kconfig" source "drivers/media/usb/hdpvr/Kconfig" source "drivers/media/usb/stk1160/Kconfig" source "drivers/media/usb/go7007/Kconfig" -endif -if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) - comment "Analog/digital TV USB devices" +comment "Analog/digital TV USB devices" source "drivers/media/usb/au0828/Kconfig" source "drivers/media/usb/cx231xx/Kconfig" source "drivers/media/usb/tm6000/Kconfig" -endif - -if I2C && MEDIA_DIGITAL_TV_SUPPORT - comment "Digital TV USB devices" +comment "Digital TV USB devices" source "drivers/media/usb/dvb-usb/Kconfig" source "drivers/media/usb/dvb-usb-v2/Kconfig" source "drivers/media/usb/ttusb-budget/Kconfig" @@ -46,25 +38,18 @@ source "drivers/media/usb/ttusb-dec/Kconfig" source "drivers/media/usb/siano/Kconfig" source "drivers/media/usb/b2c2/Kconfig" source "drivers/media/usb/as102/Kconfig" -endif -if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) - comment "Webcam, TV (analog/digital) USB devices" +comment "Webcam, TV (analog/digital) USB devices" source "drivers/media/usb/em28xx/Kconfig" -endif -if MEDIA_SDR_SUPPORT - comment "Software defined radio USB devices" +comment "Software defined radio USB devices" source "drivers/media/usb/airspy/Kconfig" source "drivers/media/usb/hackrf/Kconfig" source "drivers/media/usb/msi2500/Kconfig" -endif -if MEDIA_CEC_SUPPORT - comment "USB HDMI CEC adapters" +comment "USB HDMI CEC adapters" source "drivers/media/usb/pulse8-cec/Kconfig" source "drivers/media/usb/rainshadow-cec/Kconfig" -endif endif #MEDIA_USB_SUPPORT endif #USB diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig index b21a4d413872..8ebda4361b65 100644 --- a/drivers/media/usb/dvb-usb-v2/Kconfig +++ b/drivers/media/usb/dvb-usb-v2/Kconfig @@ -137,7 +137,7 @@ config DVB_USB_RTL28XXU select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT select DVB_RTL2830 select DVB_RTL2832 - select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT) + select DVB_RTL2832_SDR if MEDIA_SUBDRV_AUTOSELECT select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_E4000 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_FC0012 if MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig index f2031a933e54..7031d6e80304 100644 --- a/drivers/media/usb/em28xx/Kconfig +++ b/drivers/media/usb/em28xx/Kconfig @@ -12,8 +12,8 @@ config VIDEO_EM28XX_V4L2 select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT - select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT - select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT + select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT + select VIDEO_OV2640 if MEDIA_SUBDRV_AUTOSELECT help This is a video4linux driver for Empia 28xx based TV cards. diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig index 4ff79940ad8d..533e95375082 100644 --- a/drivers/media/usb/go7007/Kconfig +++ b/drivers/media/usb/go7007/Kconfig @@ -12,7 +12,7 @@ config VIDEO_GO7007 select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT help This is a video4linux driver for the WIS GO7007 MPEG diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 93bc9bef7641..e68af4112505 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -557,7 +557,6 @@ config SND_ES1968_INPUT config SND_ES1968_RADIO bool "Enable TEA5757 radio tuner support for es1968" depends on SND_ES1968 - depends on MEDIA_RADIO_SUPPORT depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968 select RADIO_ADAPTERS select RADIO_TEA575X @@ -581,7 +580,6 @@ config SND_FM801 config SND_FM801_TEA575X_BOOL bool "ForteMedia FM801 + TEA5757 tuner" depends on SND_FM801 - depends on MEDIA_RADIO_SUPPORT depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801 select RADIO_ADAPTERS select RADIO_TEA575X