From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: [PATCH 6/7] media: Kconfig: fix selection for test drivers
Date: Thu, 26 Mar 2020 16:21:31 +0100 [thread overview]
Message-ID: <c267c23e0884172beac4fb4e68c35fc26ff2e615.1585235736.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1585235736.git.mchehab+huawei@kernel.org>
There are some long-time mistakes related to build test
drivers, with regards to depends on/select. Also, as we
now want to build any test driver without needing to
enable anything else, change the logic in order to properly
filter them.
Please notice that the PCI skeleton is somewhat an
exception, as it requires to select *both* SAMPLES and
MEDIA_TEST_SUPPORT. I almost changed it to be either one,
but decided to keep it as-is, as this is something that
we don't really need to be included on any distribution.
The only reason for someone to build it is for COMPILE_TEST
purposes.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
drivers/media/Kconfig | 2 +-
drivers/media/dvb-frontends/Kconfig | 9 +++++++--
drivers/media/pci/Kconfig | 10 +++++-----
drivers/media/test_drivers/Kconfig | 2 +-
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index bb8148f2d4c0..35be61bf36aa 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -157,7 +157,7 @@ comment "Video4Linux core enabled to support hybrid TV devices"
config VIDEO_DEV
tristate
prompt "Video4Linux core" if !(MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI)
- default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || MEDIA_PLATFORM_SUPPORT || MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI
+ default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || MEDIA_PLATFORM_SUPPORT || MEDIA_TEST_SUPPORT || MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI
help
Enables the V4L2 API, used by cameras, analog TV, video grabbers,
radio devices and by some input devices.
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 932fd88fdc12..1f45808d94da 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -1,3 +1,5 @@
+if MEDIA_DIGITAL_TV_SUPPORT
+
comment "DVB Frontend drivers hidden by 'Autoselect ancillary drivers'"
depends on MEDIA_HIDE_ANCILLARY_SUBDRV
@@ -943,13 +945,16 @@ config DVB_SP2
help
CIMaX SP2/SP2HF Common Interface module.
+endmenu # Customise DVB Frontends
+
+endif # MEDIA_DIGITAL_TV_SUPPORT
+
comment "Tools to develop new frontends"
depends on MEDIA_TEST_SUPPORT
config DVB_DUMMY_FE
tristate "Dummy frontend driver"
- depends on DVB_CORE
depends on MEDIA_TEST_SUPPORT
+ select DVB_CORE
help
Dummy skeleton frontend driver.
-endmenu
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index 348da044ec78..44f1efd21272 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -6,7 +6,7 @@ config MEDIA_HYBRID_PCI
depends on VIDEO_CX18 || VIDEO_CX23885 || VIDEO_CX88 || VIDEO_BT848 || VIDEO_SAA7134 || VIDEO_SAA7164
default y
-if PCI && MEDIA_SUPPORT
+if PCI
menuconfig MEDIA_PCI_SUPPORT
bool "Media PCI Adapters"
@@ -65,11 +65,11 @@ source "drivers/media/pci/intel/ipu3/Kconfig"
config VIDEO_PCI_SKELETON
tristate "Skeleton PCI V4L2 driver"
- depends on MEDIA_TEST_SUPPORT
- depends on PCI
depends on SAMPLES
- depends on VIDEO_V4L2 && VIDEOBUF2_CORE
- depends on VIDEOBUF2_MEMOPS && VIDEOBUF2_DMA_CONTIG
+ depends on MEDIA_TEST_SUPPORT
+ depends on PCI && VIDEO_V4L2
+ select VIDEOBUF2_MEMOPS
+ select VIDEOBUF2_DMA_CONTIG
help
Enable build of the skeleton PCI driver, used as a reference
when developing new drivers.
diff --git a/drivers/media/test_drivers/Kconfig b/drivers/media/test_drivers/Kconfig
index 258a4d36c0d3..9f4a9cfbacc9 100644
--- a/drivers/media/test_drivers/Kconfig
+++ b/drivers/media/test_drivers/Kconfig
@@ -4,7 +4,7 @@ if MEDIA_TEST_SUPPORT
menuconfig V4L_TEST_DRIVERS
bool "V4L test drivers"
- depends on MEDIA_CAMERA_SUPPORT
+ depends on VIDEO_DEV
if V4L_TEST_DRIVERS
--
2.25.1
next prev parent reply other threads:[~2020-03-26 15:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 15:21 [PATCH 0/7] media Kconfig reorg - part 3 Mauro Carvalho Chehab
2020-03-26 15:21 ` [PATCH 1/7] media: Kconfig: warn if drivers are filtered Mauro Carvalho Chehab
2020-03-26 15:21 ` [PATCH 2/7] media: Kconfig: mark other drivers as test drivers Mauro Carvalho Chehab
2020-03-26 15:21 ` [PATCH 3/7] media: ddbridge: copy the dvb_dummy_fe driver to ddbridge Mauro Carvalho Chehab
2020-03-26 15:21 ` [PATCH 4/7] media: ddbridge-dummy_fe: do some vars and function renames Mauro Carvalho Chehab
2020-03-26 15:21 ` [PATCH 5/7] media: ddbridge: use the ddbridge's own dummy fe driver Mauro Carvalho Chehab
2020-03-26 15:21 ` Mauro Carvalho Chehab [this message]
2020-03-26 15:21 ` [PATCH 7/7] media: add SPDX headers on Kconfig and Makefile files Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c267c23e0884172beac4fb4e68c35fc26ff2e615.1585235736.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).