remove DVB_AV7110_FIRMWARE
PATCH 1/1 remove DVB_AV7110_FIRMWARE
DVB_AV7110_FIRMWARE was (except for some OSS drivers) the only option that was still compiling a binary-only user-supplied firmware file at build-time into the kernel.
This patch changes the driver to always use the standard request_firmware() way for firmware by removing DVB_AV7110_FIRMWARE.
---
drivers/media/dvb/ttpci/Kconfig | 20 -------------- drivers/media/dvb/ttpci/Makefile | 8 ----- drivers/media/dvb/ttpci/av7110.c | 15 ---------- drivers/media/dvb/ttpci/fdump.c | 44 ------------------------------- 4 files changed, 1 insertion(+), 86 deletions(-)
drivers/media/dvb/ttpci/Kconfig renamed from drivers/media/dvb/ttpci/Kconfig.old +1 -19
@@ -1,7 +1,7 @@ config DVB_AV7110 tristate "AV7110 cards" depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 - select FW_LOADER if !DVB_AV7110_FIRMWARE + select FW_LOADER select VIDEO_SAA7146_VV select DVB_PLL select DVB_VES1820 if !DVB_FE_CUSTOMISE
@@ -26,24 +26,6 @@ Say Y if you own such a card and want to use it. -config DVB_AV7110_FIRMWARE - bool "Compile AV7110 firmware into the driver" - depends on DVB_AV7110 && !STANDALONE - default y if DVB_AV7110=y - help - The AV7110 firmware is normally loaded by the firmware hotplug manager. - If you want to compile the firmware into the driver you need to say - Y here and provide the correct path of the firmware. You need this - option if you want to compile the whole driver statically into the - kernel. - - All other people say N. - -config DVB_AV7110_FIRMWARE_FILE - string "Full pathname of av7110 firmware file" - depends on DVB_AV7110_FIRMWARE - default "/usr/lib/hotplug/firmware/dvb-ttpci-01.fw" - config DVB_AV7110_OSD bool "AV7110 OSD support" depends on DVB_AV7110
drivers/media/dvb/ttpci/Makefile renamed from drivers/media/dvb/ttpci/Makefile.old +0 -8
@@ -13,11 +13,3 @@ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ -hostprogs-y := fdump - -ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y) -$(obj)/av7110.o: $(obj)/av7110_firm.h - -$(obj)/av7110_firm.h: $(obj)/fdump - $(obj)/fdump $(CONFIG_DVB_AV7110_FIRMWARE_FILE) dvb_ttpci_fw $@ -endif
drivers/media/dvb/ttpci/av7110.c renamed from drivers/media/dvb/ttpci/av7110.c.old +0 -15
@@ -1484,20 +1484,6 @@return 0 ; } -#ifdef CONFIG_DVB_AV7110_FIRMWARE_FILE -#include "av7110_firm.h" -static void put_firmware (struct av7110 * av7110) -{ - av7110->bin_fw =NULL ; -} - -static inline int get_firmware (struct av7110 * av7110) -{ - av7110->bin_fw = dvb_ttpci_fw; - av7110->size_fw =sizeof (dvb_ttpci_fw); -return check_firmware (av7110); -} -#else static void put_firmware (struct av7110 * av7110) {vfree (av7110->bin_fw);
@@ -1546,7 +1532,6 @@release_firmware (fw);return ret; } -#endif static int alps_bsrv2_tuner_set_params (struct dvb_frontend * fe,struct dvb_frontend_parameters *params)
drivers/media/dvb/ttpci/fdump.c deleted +0 -44
44 lines not on this page · raw message
Quoted 6 lines · Adrian Bunk
DVB_AV7110_FIRMWAREwas (except for some OSS drivers) the only option that was still compiling a binary-only user-supplied firmware file at build-time into the kernel.This patch changes the driver to always use the standard
request_firmware()way for firmware by removingDVB_AV7110_FIRMWARE.
Doesn't this also prevent the AV7110 module from getting compiled into the kernel? Shouldn't the Kconfig file be adjusted so that 'y' can't be selected anymore and it depends on MODULES?
Quoted 11 lines · Trent Piepho
Quoted 6 lines · Adrian Bunk
DVB_AV7110_FIRMWAREwas (except for some OSS drivers) the only option that was still compiling a binary-only user-supplied firmware file at build-time into the kernel.This patch changes the driver to always use the standard
request_firmware()way for firmware by removingDVB_AV7110_FIRMWARE.Doesn't this also prevent the AV7110 module from getting compiled into the kernel? Shouldn't the
Kconfigfile be adjusted so that 'y' can't be selected anymore and it depends on MODULES?
No.
No.
request_firmware() works fine for built-in drivers.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedQuoted 9 lines · Adrian Bunk
Quoted 8 lines · Trent Piepho
Quoted 6 lines · Adrian Bunk
DVB_AV7110_FIRMWAREwas (except for some OSS drivers) the only option that was still compiling a binary-only user-supplied firmware file at build-time into the kernel.This patch changes the driver to always use the standard
request_firmware()way for firmware by removingDVB_AV7110_FIRMWARE.
Quoted 8 lines
Quoted 3 lines
Doesn't this also prevent the AV7110 module from getting compiled into the kernel? Shouldn't the
Kconfigfile be adjusted so that 'y' can't be selected anymore and it depends on MODULES?No.
No.
request_firmware()works fine for built-in drivers.
Wouldn't that require loading the firmware file before the filesystems are mounted?
Quoted 14 lines · Trent Piepho
Quoted 13 lines · Adrian Bunk
Quoted 11 lines · Trent Piepho
Quoted 6 lines · Adrian Bunk
DVB_AV7110_FIRMWAREwas (except for some OSS drivers) the only option that was still compiling a binary-only user-supplied firmware file at build-time into the kernel.This patch changes the driver to always use the standard
request_firmware()way for firmware by removingDVB_AV7110_FIRMWARE.Doesn't this also prevent the AV7110 module from getting compiled into the kernel? Shouldn't the
Kconfigfile be adjusted so that 'y' can't be selected anymore and it depends on MODULES?
Quoted 7 lines
Quoted 4 lines
No.
No.
request_firmware()works fine for built-in drivers.Wouldn't that require loading the firmware file before the filesystems are mounted?
Sure.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedQuoted 18 lines · Adrian Bunk
Quoted 17 lines · Trent Piepho
Quoted 16 lines · Adrian Bunk
Quoted 11 lines · Trent Piepho
Quoted 6 lines · Adrian Bunk
DVB_AV7110_FIRMWAREwas (except for some OSS drivers) the only option that was still compiling a binary-only user-supplied firmware file at build-time into the kernel.This patch changes the driver to always use the standard
request_firmware()way for firmware by removingDVB_AV7110_FIRMWARE.Doesn't this also prevent the AV7110 module from getting compiled into the kernel? Shouldn't the
Kconfigfile be adjusted so that 'y' can't be selected anymore and it depends on MODULES?No.
No.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
request_firmware()works fine for built-in drivers.Wouldn't that require loading the firmware file before the filesystems are mounted?
Sure.
And you have to create an initrd for the firmware!
As I wrote before:
I NAK any attempt to remove this option.
The option _is_ useful because it allows a user to build an av7110 driver without hotplug, initrd etc.
Nobody has to use this option, but it should be possible to do so.
CU
Oliver
Signature · 4 lines
-------------------------------------------------------- VDR Remote Plugin 0.3.8 available at http://www.escape-edv.de/endriss/vdr/ --------------------------------------------------------
Quoted 28 lines · Oliver Endriss
Quoted 18 lines · Adrian Bunk
Quoted 17 lines · Trent Piepho
Quoted 16 lines · Adrian Bunk
Quoted 11 lines · Trent Piepho
Quoted 6 lines · Adrian Bunk
DVB_AV7110_FIRMWAREwas (except for some OSS drivers) the only option that was still compiling a binary-only user-supplied firmware file at build-time into the kernel.This patch changes the driver to always use the standard
request_firmware()way for firmware by removingDVB_AV7110_FIRMWARE.Doesn't this also prevent the AV7110 module from getting compiled into the kernel? Shouldn't the
Kconfigfile be adjusted so that 'y' can't be selected anymore and it depends on MODULES?No.
No.Quoted 6 lines
Quoted 4 lines
Quoted 1 line
request_firmware()works fine for built-in drivers.Wouldn't that require loading the firmware file before the filesystems are mounted?
Sure.
And you have to create an initrd for the firmware!
Quoted 7 lines
As I wrote before:
I NAK any attempt to remove this option.The option _is_ useful because it allows a user to build an av7110 driver without hotplug, initrd etc.
Nobody has to use this option, but it should be possible to do so.
Sorry, but the direction of kernel development is to replace statically into the kernel compiled firmware (that also brings some non-trivial legal questions - is distributing such a kernel a violation of the GPL?) with request_firmware().
Quoted 2 lines
CU
Oliver
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed