diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | firmware/Makefile | 36 | ||||
| -rw-r--r-- | wct4xxp/base.c | 13 |
3 files changed, 8 insertions, 44 deletions
@@ -198,9 +198,6 @@ linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o linux26: prereq @if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi -ifeq ($(HOTPLUG_FIRMWARE),yes) - $(MAKE) -C firmware header-build -endif $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) modules xpp: linux26 diff --git a/firmware/Makefile b/firmware/Makefile index c89892d..60fb2de 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -39,11 +39,6 @@ OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.o OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.o) OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.o) -# Build a list of firmware header files to include that give the current version of firmware -HEADER_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.h) -HEADER_FILES:=$(HEADER_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.h) -HEADER_FILES:=$(HEADER_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.h) - # If "fetch" is used, --continue is not a valid option. ifeq ($(WGET),wget) WGET_ARGS:=--continue @@ -77,14 +72,10 @@ dist-clean: clean # Clean up anything we built clean: rm -f zaptel-fw-*.o - rm -f zaptel-fw-*.h # Create object files suitable for linking against object-build: $(FIRMWARE) $(OBJECT_FILES) -# Create header files suitable for including -header-build: $(FIRMWARE) $(HEADER_FILES) - # Install all downloaded firmware images for hotplug usage and build headers for inclusion hotplug-install: $(FIRMWARE) if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \ @@ -104,33 +95,14 @@ hotplug-uninstall: fi # Build object file of an oct6114 064 firmware image for linking -zaptel-fw-oct6114-064.o: ../wct4xxp/base.o zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin - @echo Making firmware object file for zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin - @echo Temporarily copying to zaptel-fw-oct6114-064.bin - @cp zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin zaptel-fw-oct6114-064.bin +zaptel-fw-oct6114-064.o: ../wct4xxp/base.o zaptel-fw-oct6114-064.bin + @echo Making firmware object file for zaptel-fw-oct6114-064.bin ../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@ ../wct4xxp/base.o - @rm -f zaptel-fw-oct6114-064.bin - -# Build header file of an oct6114 064 firmware image for inclusion -zaptel-fw-oct6114-064.h: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin - @echo Making firmware header file for zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin - @echo "static const char *zaptel_fw_oct6114_064 = \"zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin\";" > $@ # Build object file of an oct6114 128 firmware image for linking -zaptel-fw-oct6114-128.o: ../wct4xxp/base.o zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin - @echo Making firmware object file for zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin - @echo Temporarily copying to zaptel-fw-oct6114-128.bin - @cp zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin zaptel-fw-oct6114-128.bin +zaptel-fw-oct6114-128.o: ../wct4xxp/base.o zaptel-fw-oct6114-128.bin + @echo Making firmware object file for zaptel-fw-oct6114-128.bin ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ ../wct4xxp/base.o - @rm -f zaptel-fw-oct6114-128.bin - -# Build header file of an oct6114 128 firmware image for inclusion -zaptel-fw-oct6114-128.h: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin - @echo Making firmware header file for zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin - @echo "static const char *zaptel_fw_oct6114_128 = \"zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin\";" > $@ # Build object file of a TC400M firmware image for linking zaptel-fw-tc400m.o: - -# Build header file of a TC400M firmware image for inclusion -zaptel-fw-tc400m.h: diff --git a/wct4xxp/base.c b/wct4xxp/base.c index 3811a95..5d1373a 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -47,11 +47,6 @@ #include "wct4xxp.h" #include "vpm450m.h" -#ifdef HOTPLUG_FIRMWARE -#include "../firmware/zaptel-fw-oct6114-064.h" -#include "../firmware/zaptel-fw-oct6114-128.h" -#endif - /* * Tasklets provide better system interactive response at the cost of the * possibility of losing a frame of data at very infrequent intervals. If @@ -3135,9 +3130,9 @@ static void t4_vpm450_init(struct t4 *wc) switch ((vpm_capacity = get_vpm450m_capacity(wc))) { case 64: #if defined(HOTPLUG_FIRMWARE) - if ((request_firmware(&firmware, zaptel_fw_oct6114_064, &wc->dev->dev) != 0) || + if ((request_firmware(&firmware, "zaptel-fw-oct6114-064.bin", &wc->dev->dev) != 0) || !firmware) { - printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_oct6114_064); + printk("VPM450: firmware zaptel-fw-oct6114-064.bin not available from userspace\n"); return; } #else @@ -3153,9 +3148,9 @@ static void t4_vpm450_init(struct t4 *wc) break; case 128: #if defined(HOTPLUG_FIRMWARE) - if ((request_firmware(&firmware, zaptel_fw_oct6114_128, &wc->dev->dev) != 0) || + if ((request_firmware(&firmware, "zaptel-fw-oct6114-128.bin", &wc->dev->dev) != 0) || !firmware) { - printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_oct6114_128); + printk("VPM450: firmware zaptel-fw-oct6114-128.bin not available from userspace\n"); return; } #else |