[PATCH] Kconfig and Makefile updates, inspired by Adrian Bunk and Roman Zippel

 - split up saa7146 compilation in core part (saa7146.o) and video+vbi
   part (saa7146_vv).  some drivers need both (av7110.c), some drivers
   only need the core stuff (budget*.c)
 - add entry for sp887x DVB-T modulator to corresponding Kconfig
 - use new SELECT facility of Kconfig, first mentioned by Adrian Bunk
   and Roman Zippel in DVB subsystem
 - use SELECT in media/video/Kconfig, too.

diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 211e74ee07d5fc98892efa7062cda36806929365..caebd0a1c021c28745ca089c784f7e35149ae9e9 100644 (file)
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -1,8 +1,12 @@
 config VIDEO_SAA7146
-       def_tristate DVB_AV7110 || DVB_BUDGET || DVB_BUDGET_AV || \
-                    VIDEO_MXB || VIDEO_DPC || VIDEO_HEXIUM_ORION || \
-                    VIDEO_HEXIUM_GEMINI
-        depends on VIDEO_DEV && PCI && I2C
+        tristate
+       select I2C
+
+config VIDEO_SAA7146_VV
+        tristate
+       select VIDEO_BUF
+       select VIDEO_VIDEOBUF
+       select VIDEO_SAA7146
+
 config VIDEO_VIDEOBUF
-       def_tristate VIDEO_SAA7134 || VIDEO_BT848 || VIDEO_SAA7146
-        depends on VIDEO_DEV
+        tristate

diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index 4e889f8112ef3477fc47b6d98947ad77a6ae8d4e..8054d6d11177f5955766ac57e6bc1bacb1b98aaf 100644 (file)
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,5 +1,6 @@
 saa7146-objs    := saa7146_i2c.o saa7146_core.o 
 saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o  
 
-obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o saa7146_vv.o
+obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
+obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
 

diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 3253f3480ca784e280dd02d2d5121a58f7c08de2..8d72e87f6e3fb7d037190ddb134157dd672517d4 100644 (file)
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -3,16 +3,16 @@
 #
 
 menu "Digital Video Broadcasting Devices"
-       depends on NET && INET 
 
 config DVB
        bool "DVB For Linux"
+       depends on NET && INET
        ---help---
          Support Digital Video Broadcasting hardware.  Enable this if you 
          own a DVB adapter and want to use it or if you compile Linux for 
          a digital SetTopBox.
 
-         API specs and user tools and are available for example from 
+         API specs and user tools are available from
          <http://www.linuxtv.org/>. 
 
          Please report problems regarding this driver to the LinuxDVB 
@@ -33,18 +33,16 @@ source "drivers/media/dvb/dvb-core/Kconfig"
 source "drivers/media/dvb/frontends/Kconfig"
 
 comment "Supported SAA7146 based PCI Adapters"
-       depends on DVB && PCI
-
+       depends on DVB_CORE && PCI
 source "drivers/media/dvb/ttpci/Kconfig"
 
 comment "Supported USB Adapters"
-       depends on DVB && USB
-
+       depends on DVB_CORE && USB
 source "drivers/media/dvb/ttusb-budget/Kconfig"
 source "drivers/media/dvb/ttusb-dec/Kconfig"
 
 comment "Supported FlexCopII (B2C2) Adapters"
-       depends on DVB && PCI
+       depends on DVB_CORE && PCI
 source "drivers/media/dvb/b2c2/Kconfig"
 
 endmenu

diff --git a/drivers/media/dvb/dvb-core/Kconfig b/drivers/media/dvb/dvb-core/Kconfig
index 27b89b056351630bb3dca96caad5d96e99043dde..a9a7b342104816b0c78d870efd6030567cee86d8 100644 (file)
--- a/drivers/media/dvb/dvb-core/Kconfig
+++ b/drivers/media/dvb/dvb-core/Kconfig
@@ -4,5 +4,8 @@ config DVB_CORE
        select CRC32
        help
          DVB core utility functions for device handling, software fallbacks etc.
+         Say Y when you have a DVB card and want to use it. Say Y if your want
+         to build your drivers outside the kernel, but need the DVB core. All 
+         in-kernel drivers will select this automatically if needed.
+         If unsure say N.
 
-         Say Y when you have a DVB card and want to use it. If unsure say N.

diff --git a/drivers/media/dvb/dvb-core/Makefile.lib b/drivers/media/dvb/dvb-core/Makefile.lib
new file mode 100644 (file)
index 0000000..4633728
--- /dev/null
+++ b/drivers/media/dvb/dvb-core/Makefile.lib
@@ -0,0 +1 @@
+obj-$(CONFIG_DVB_CORE)         += crc32.o

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 999076818a0301e3b1bac1c583ee139fbe5d3335..a0adb73d45ab72978c973fc71a47827bfdfd9048 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -26,6 +26,16 @@ config DVB_ALPS_BSRV2
          DVB adapter simply enable all supported frontends, the 
          right one will get autodetected.
 
+config DVB_SP887X
+       tristate "Frontends with sp887x demodulators, e.g. Microtune DTF7072"
+       depends on DVB_CORE
+       help
+         A DVB-T demodulator driver. Say Y when you want to support the sp887x.
+ 
+         If you don't know what tuner module is soldered on your
+         DVB adapter simply enable all supported frontends, the
+         right one will get autodetected.
+
 config DVB_ALPS_TDLB7
        tristate "Alps TDLB7 (OFDM)"
        depends on DVB_CORE

diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 569ba707277d264bf3d3f3ab35d6c90b8f252a44..707e7494a4d88508f3d986d5d0741b3ae47d8285 100644 (file)
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -1,6 +1,8 @@
 config DVB_AV7110
        tristate "AV7110 cards"
-       depends on VIDEO_DEV && DVB_CORE
+       depends on DVB_CORE
+       select VIDEO_DEV
+       select VIDEO_SAA7146_VV
        help
          Support for SAA7146 and AV7110 based DVB cards as produced 
          by Fujitsu-Siemens, Technotrend, Hauppauge and others.
@@ -26,6 +28,7 @@ config DVB_AV7110_OSD
 config DVB_BUDGET
        tristate "Budget cards"
        depends on DVB_CORE
+       select VIDEO_SAA7146
        help
          Support for simple SAA7146 based DVB cards
          (so called Budget- or Nova-PCI cards) without onboard
@@ -38,7 +41,8 @@ config DVB_BUDGET
 
 config DVB_BUDGET_CI
        tristate "Budget cards with onboard CI connector"
-       depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+       depends on DVB_CORE
+       select VIDEO_SAA7146
        help
          Support for simple SAA7146 based DVB cards
          (so called Budget- or Nova-PCI cards) without onboard
@@ -51,7 +55,9 @@ config DVB_BUDGET_CI
 
 config DVB_BUDGET_AV
        tristate "Budget cards with analog video inputs"
-       depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+       depends on DVB_CORE
+       select VIDEO_DEV
+       select VIDEO_SAA7146_VV
        help
          Support for simple SAA7146 based DVB cards
          (so called Budget- or Nova-PCI cards) without onboard
@@ -64,7 +70,9 @@ config DVB_BUDGET_AV
 
 config DVB_BUDGET_PATCH
        tristate "AV7110 cards with Budget Patch"
-       depends on DVB_CORE && DVB_BUDGET
+       depends on DVB_BUDGET
+       select VIDEO_DEV
+       select VIDEO_SAA7146_VV
        help
          Support for Budget Patch (full TS) modification on 
          SAA7146+AV7110 based cards (DVB-S cards). This

diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/dvb/ttusb-budget/Kconfig
index c8bbbcc68f455d1eedc71f431f69b4a5edbcfeb4..e2fd156a3bdb143f54eb83375ef0dcca8c62b0e1 100644 (file)
--- a/drivers/media/dvb/ttusb-budget/Kconfig
+++ b/drivers/media/dvb/ttusb-budget/Kconfig
@@ -1,6 +1,6 @@
 config DVB_TTUSB_BUDGET
        tristate "Technotrend/Hauppauge Nova-USB devices"
-       depends on DVB_CORE && USB
+       depends on DVB_CORE
        help
          Support for external USB adapters designed by Technotrend and
          produced by Hauppauge, shipped under the brand name 'Nova-USB'.

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 47cc0f40442f5617c40697382bbe7327f32461ec..7f810a6f40391437f417fae264d50d423a310585 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menu "Video For Linux"
-       depends on VIDEO_DEV!=n
+       depends on VIDEO_DEV
 
 comment "Video Adapters"
 
@@ -228,7 +228,8 @@ config VIDEO_SAA7134
 
 config VIDEO_MXB
        tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
-       depends on VIDEO_DEV && PCI && I2C
+       depends on VIDEO_DEV && PCI
+       select VIDEO_SAA7146_VV
        ---help---
          This is a video4linux driver for the 'Multimedia eXtension Board'
          TV card by Siemens-Nixdorf.
@@ -238,7 +239,8 @@ config VIDEO_MXB
 
 config VIDEO_DPC
        tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
-       depends on VIDEO_DEV && PCI && I2C
+       depends on VIDEO_DEV && PCI
+       select VIDEO_SAA7146_VV
        ---help---
          This is a video4linux driver for the 'dpc7146 demonstration
          board' by Philips-Semiconductors. It's the reference design
@@ -251,7 +253,8 @@ config VIDEO_DPC
 
 config VIDEO_HEXIUM_ORION
        tristate "Hexium HV-PCI6 and Orion frame grabber"
-       depends on VIDEO_DEV && PCI && I2C
+       depends on VIDEO_DEV && PCI
+       select VIDEO_SAA7146_VV
        ---help---
          This is a video4linux driver for the Hexium HV-PCI6 and
          Orion frame grabber cards by Hexium.
@@ -261,7 +264,8 @@ config VIDEO_HEXIUM_ORION
 
 config VIDEO_HEXIUM_GEMINI
        tristate "Hexium Gemini frame grabber"
-       depends on VIDEO_DEV && PCI && I2C
+       depends on VIDEO_DEV && PCI
+       select VIDEO_SAA7146_VV
        ---help---
          This is a video4linux driver for the Hexium Gemini frame
          grabber card by Hexium. Please note that the Gemini Dual