[zaptel-commits] file: branch 1.4 r2776 - in /branches/1.4: firmware/ wctdm24xxp/

[SVN commits to the Zaptel project]

Author: file
Date: Tue Jul 24 13:02:35 2007
New Revision: 2776

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2776
Log:
Add support for building the firmware for the wctdm24xxp driver as an object using the new firmware system.

Removed:
    branches/1.4/wctdm24xxp/VPMADT032.bin
Modified:
    branches/1.4/firmware/Makefile
    branches/1.4/wctdm24xxp/Makefile
    branches/1.4/wctdm24xxp/Makefile.kernel26

Modified: branches/1.4/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/firmware/Makefile?view=diff&rev=2776&r1=2775&r2=2776
==============================================================================
--- branches/1.4/firmware/Makefile (original)
+++ branches/1.4/firmware/Makefile Tue Jul 24 13:02:35 2007
@@ -40,7 +40,7 @@
 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)
-#OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032.o)
+OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032.o)
 
 # If "fetch" is used, --continue is not a valid option.
 ifeq ($(WGET),wget)
@@ -194,3 +194,8 @@
 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
+
+# Build object file of a VPMADT032 firmware image for linking
+zaptel-fw-vpmadt032.o: zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz ../wctdm24xxp/base.o zaptel-fw-vpmadt032.bin
+	@echo Making firmware object file for zaptel-fw-vpmadt032.bin
+	../build_tools/make_firmware_object zaptel-fw-vpmadt032.bin $@ ../wctdm24xxp/base.o

Modified: branches/1.4/wctdm24xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/Makefile?view=diff&rev=2776&r1=2775&r2=2776
==============================================================================
--- branches/1.4/wctdm24xxp/Makefile (original)
+++ branches/1.4/wctdm24xxp/Makefile Tue Jul 24 13:02:35 2007
@@ -13,7 +13,10 @@
 
 GpakCust.o: GpakCust.h
 
-wctdm24xxp.o: base.o GpakCust.o GpakApi.o
+../firmware/zaptel-fw-vpmadt032.o: base.o
+	$(MAKE) -C ../firmware zaptel-fw-vpmadt032.o
+
+wctdm24xxp.o: base.o GpakCust.o GpakApi.o ../firmware/zaptel-fw-vpmadt032.o
 	$(LD) -r -o $@ $^
 
 clean:

Modified: branches/1.4/wctdm24xxp/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/Makefile.kernel26?view=diff&rev=2776&r1=2775&r2=2776
==============================================================================
--- branches/1.4/wctdm24xxp/Makefile.kernel26 (original)
+++ branches/1.4/wctdm24xxp/Makefile.kernel26 Tue Jul 24 13:02:35 2007
@@ -3,6 +3,13 @@
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
 
 wctdm24xxp-objs := base.o GpakCust.o GpakApi.o
+
+ifneq ($(HOTPLUG_FIRMWARE),yes)
+wctdm24xxp-objs += ../firmware/zaptel-fw-vpmadt032.o
+endif
+
+$(obj)/../firmware/zaptel-fw-vpmadt032.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/../firmware zaptel-fw-vpmadt032.o
 
 $(obj)/base.o: $(src)/GpakCust.h $(src)/wctdm24xxp.h
 $(obj)/base.o: $(src)/../zaptel.h