Skip to content

Commit

Permalink
Remove fdump tool for av7110 firmware
Browse files Browse the repository at this point in the history
There's no point in this, since the user can use the BUILTIN_FIRMWARE
option to include arbitrary firmware files directly in the kernel image.

Thanks to David Woodhouse for help.

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Jaswinder Singh authored and David Woodhouse committed Apr 6, 2009
1 parent 9137f05 commit 4f8d182
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 87 deletions.
23 changes: 5 additions & 18 deletions drivers/media/dvb/ttpci/Kconfig
Expand Up @@ -28,25 +28,12 @@ config DVB_AV7110
download/extract it, and then copy it to /usr/lib/hotplug/firmware
or /lib/firmware (depending on configuration of firmware hotplug).

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.
Alternatively, you can download the file and use the kernel's
EXTRA_FIRMWARE configuration option to build it into your
kernel image by adding the filename to the EXTRA_FIRMWARE
configuration option string.

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"
Say Y if you own such a card and want to use it.

config DVB_AV7110_OSD
bool "AV7110 OSD support"
Expand Down
9 changes: 0 additions & 9 deletions drivers/media/dvb/ttpci/Makefile
Expand Up @@ -19,12 +19,3 @@ obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o

EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
EXTRA_CFLAGS += -Idrivers/media/common/tuners

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
16 changes: 0 additions & 16 deletions drivers/media/dvb/ttpci/av7110.c
Expand Up @@ -1518,20 +1518,6 @@ static int check_firmware(struct av7110* av7110)
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);
Expand Down Expand Up @@ -1580,8 +1566,6 @@ static int get_firmware(struct av7110* av7110)
release_firmware(fw);
return ret;
}
#endif


static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
{
Expand Down
44 changes: 0 additions & 44 deletions drivers/media/dvb/ttpci/fdump.c

This file was deleted.

0 comments on commit 4f8d182

Please sign in to comment.