Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 755a18ba authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (7851): Fix FW_LOADER depencency at v4l/dvb 



Since:
1) FW_LOADER is defined as:

config FW_LOADER
        tristate "Userspace firmware loading support"
        depends on HOTPLUG

2) several V4L/DVB driver just selects it;

3) select is not smart enough to auto-select HOTPLUG, if select FW_LOADER.

So, All drivers that select FW_LOADER should also depend on HOTPLUG.

An easier solution (for the end-user perspective) would be to "select HOTPLUG".
However, live is not simple. This would cause recursive dependency issues like
this one:

drivers/usb/Kconfig:62:error: found recursive dependency: USB -> USB_OHCI_HCD
-> I2C -> MEDIA_TUNER -> MEDIA_TUNER_XC2028 -> HOTPLUG -> PCCARD -> PCMCIA ->
USB_ARCH_HAS_HCD -> MOUSE_APPLETOUCH -> USB

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ec44c9ae

drivers/media/common/tuners/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ config MEDIA_TUNER_XC2028 


config MEDIA_TUNER_XC5000

	tristate "Xceive XC5000 silicon tuner"

	depends on HOTPLUG

	select FW_LOADER

	default m if DVB_FE_CUSTOMISE

	help

drivers/media/dvb/bt8xx/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DVB_BT8XX

	tristate "BT8xx based PCI cards"

	depends on DVB_CORE && PCI && I2C && VIDEO_BT848

	depends on HOTPLUG	# due to FW_LOADER

	select DVB_MT352 if !DVB_FE_CUSTOMISE

	select DVB_SP887X if !DVB_FE_CUSTOMISE

	select DVB_NXT6000 if !DVB_FE_CUSTOMISE

drivers/media/dvb/dvb-usb/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DVB_USB

	tristate "Support for various USB DVB devices"

	depends on DVB_CORE && USB && I2C

	depends on HOTPLUG	# due to FW_LOADER

	select FW_LOADER

	help

	  By enabling this you will be able to choose the various supported

drivers/media/dvb/frontends/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ comment "DVB-T (terrestrial) frontends" 


config DVB_SP8870

	tristate "Spase sp8870 based"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && HOTPLUG

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help
@@ -110,7 +110,7 @@ config DVB_SP8870 


config DVB_SP887X

	tristate "Spase sp887x based"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && HOTPLUG

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help
@@ -144,7 +144,7 @@ config DVB_L64781 


config DVB_TDA1004X

	tristate "Philips TDA10045H/TDA10046H based"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && HOTPLUG

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help
@@ -211,7 +211,7 @@ config DVB_DIB7000P 


config DVB_TDA10048

	tristate "Philips TDA10048HN based"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && HOTPLUG

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help
@@ -253,7 +253,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends" 


config DVB_NXT200X

	tristate "NxtWave Communications NXT2002/NXT2004 based"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && HOTPLUG

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help
@@ -268,7 +268,7 @@ config DVB_NXT200X 


config DVB_OR51211

	tristate "Oren OR51211 based"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && HOTPLUG

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help
@@ -281,7 +281,7 @@ config DVB_OR51211 


config DVB_OR51132

	tristate "Oren OR51132 based"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && HOTPLUG

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help
@@ -297,7 +297,7 @@ config DVB_OR51132 


config DVB_BCM3510

	tristate "Broadcom BCM3510"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && HOTPLUG

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

drivers/media/dvb/ttpci/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config TTPCI_EEPROM 
config DVB_AV7110

	tristate "AV7110 cards"

	depends on DVB_CORE && PCI && I2C

	depends on HOTPLUG

	select FW_LOADER if !DVB_AV7110_FIRMWARE

	select TTPCI_EEPROM

	select VIDEO_SAA7146_VV
@@ -123,6 +124,7 @@ config DVB_BUDGET_AV 
	depends on DVB_BUDGET_CORE && I2C

	select VIDEO_SAA7146_VV

	depends on VIDEO_DEV	# dependencies of VIDEO_SAA7146_VV

	depends on HOTPLUG	# dependency of FW_LOADER

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_TDA1004X if !DVB_FE_CUSTOMISE