diff options
| -rw-r--r-- | firmware/Makefile | 4 | ||||
| -rw-r--r-- | wctc4xxp/Makefile.kernel26 | 7 | ||||
| -rw-r--r-- | wctc4xxp/base.c | 13 | ||||
| -rw-r--r-- | wctc4xxp/tc400m-firmware.bin | bin | 1400630 -> 0 bytes |
4 files changed, 13 insertions, 11 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 7dd4a04..7bcbf6b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -165,4 +165,6 @@ zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz ../ ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ ../wct4xxp/base.o # Build object file of a TC400M firmware image for linking -zaptel-fw-tc400m.o: +zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz ../wctc4xxp/base.o zaptel-fw-tc400m.bin + @echo Making firmware object file for zaptel-fw-tc400m.bin + ../build_tools/make_firmware_object zaptel-fw-tc400m.bin $@ ../wctc4xxp/base.o diff --git a/wctc4xxp/Makefile.kernel26 b/wctc4xxp/Makefile.kernel26 index b034819..598c025 100644 --- a/wctc4xxp/Makefile.kernel26 +++ b/wctc4xxp/Makefile.kernel26 @@ -5,11 +5,10 @@ EXTRA_CFLAGS := -I$(src)/.. -Wno-undef wctc4xxp-objs := base.o ifneq ($(HOTPLUG_FIRMWARE),yes) -wctc4xxp-objs += firmware_tc400m.o +wctc4xxp-objs += ../firmware/zaptel-fw-tc400m.o endif $(obj)/base.o: $(src)/../zaptel.h -$(obj)/firmware_tc400m.o: $(src)/tc400m-firmware.bin $(obj)/base.o - @echo Making firmware object file for $(notdir $<) - @cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o +$(obj)/../firmware/zaptel-fw-tc400m.o: $(obj)/base.o + $(MAKE) -C $(obj)/../firmware zaptel-fw-tc400m.o diff --git a/wctc4xxp/base.c b/wctc4xxp/base.c index 47eaa2b..cbdf8b7 100644 --- a/wctc4xxp/base.c +++ b/wctc4xxp/base.c @@ -53,10 +53,7 @@ #endif #ifdef HOTPLUG_FIRMWARE -static const char *dte_firmware = "tc400m-firmware.bin"; -#else -extern u8 _binary_tc400m_firmware_bin_start[]; -extern void _binary_tc400m_firmware_bin_size; +static const char *dte_firmware = "zaptel-fw-tc400m.bin"; #endif @@ -1508,6 +1505,10 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic static int initd_ifaces=0; unsigned char g729_numchannels, g723_numchannels, min_numchannels, dte_firmware_ver; unsigned int complexfmts; +#if !defined(HOTPLUG_FIRMWARE) + extern void _binary_zaptel_fw_tc400m_bin_size; + extern u8 _binary_zaptel_fw_tc400m_bin_start[]; +#endif struct firmware embedded_firmware = { #if !defined(HOTPLUG_FIRMWARE) /* Yes... this is weird. objcopy gives us a symbol containing @@ -1516,8 +1517,8 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic is to take its address, so we define it as a pointer and then cast that value to the proper type. */ - .size = (size_t) &_binary_tc400m_firmware_bin_size, - .data = _binary_tc400m_firmware_bin_start, + .size = (size_t) &_binary_zaptel_fw_tc400m_bin_size, + .data = _binary_zaptel_fw_tc400m_bin_start, #endif }; const struct firmware *firmware = &embedded_firmware; diff --git a/wctc4xxp/tc400m-firmware.bin b/wctc4xxp/tc400m-firmware.bin Binary files differdeleted file mode 100644 index 2e6c743..0000000 --- a/wctc4xxp/tc400m-firmware.bin +++ /dev/null |