[zaptel-commits] file: trunk r2137 - in /trunk: ./ Makefile
firmware/Makefile wct4xxp/base.c
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Fri Feb 9 09:56:04 MST 2007
Author: file
Date: Fri Feb 9 10:56:03 2007
New Revision: 2137
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2137
Log:
Merged revisions 2136 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
r2136 | file | 2007-02-09 11:53:31 -0500 (Fri, 09 Feb 2007) | 2 lines
Drop the need for header files by using non-versioned binary files.
........
Modified:
trunk/ (props changed)
trunk/Makefile
trunk/firmware/Makefile
trunk/wct4xxp/base.c
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Feb 9 10:56:03 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087,2099,2105,2107,2111,2120
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087,2099,2105,2107,2111,2120,2136
Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2137&r1=2136&r2=2137
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Feb 9 10:56:03 2007
@@ -187,9 +187,6 @@
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
Modified: trunk/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/firmware/Makefile?view=diff&rev=2137&r1=2136&r2=2137
==============================================================================
--- trunk/firmware/Makefile (original)
+++ trunk/firmware/Makefile Fri Feb 9 10:56:03 2007
@@ -39,11 +39,6 @@
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,13 +72,9 @@
# 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)
@@ -104,33 +95,14 @@
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:
Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=2137&r1=2136&r2=2137
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Fri Feb 9 10:56:03 2007
@@ -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
@@ -3140,9 +3135,9 @@
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
@@ -3158,9 +3153,9 @@
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
More information about the zaptel-commits
mailing list