[svn-commits] file: branch file/zaptel-firmware r1861 - /team/file/zaptel-firmware/wct4xxp/

[svn-commits at lists.digium.com]

Author: file
Date: Fri Jan 19 00:34:58 2007
New Revision: 1861

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1861
Log:
Drop object creation of firmware from here and let the firmware Makefile do it.

Modified:
    team/file/zaptel-firmware/wct4xxp/Kbuild
    team/file/zaptel-firmware/wct4xxp/Makefile

Modified: team/file/zaptel-firmware/wct4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/Kbuild?view=diff&rev=1861&r1=1860&r2=1861
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/Kbuild (original)
+++ team/file/zaptel-firmware/wct4xxp/Kbuild Fri Jan 19 00:34:58 2007
@@ -5,7 +5,7 @@
 wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wct4xxp-objs += firmware_oct6114-64d.o firmware_oct6114-128d.o
+wct4xxp-objs += ../firmware/zaptel-fw-octasic-064.o ../firmware/zaptel-fw-octasic-128.o
 endif
 
 $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
@@ -13,11 +13,3 @@
 
 $(obj)/vpm450m.o: $(src)/vpm450m.h
 $(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
-
-$(obj)/firmware_oct6114-64d.o: $(src)/OCT6114-64D.ima $(obj)/base.o
-	@echo Making firmware object file for $(notdir $<)
-	@cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o
-
-$(obj)/firmware_oct6114-128d.o: $(src)/OCT6114-128D.ima $(obj)/base.o
-	@echo Making firmware object file for $(notdir $<)
-	@cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o

Modified: team/file/zaptel-firmware/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/Makefile?view=diff&rev=1861&r1=1860&r2=1861
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/Makefile (original)
+++ team/file/zaptel-firmware/wct4xxp/Makefile Fri Jan 19 00:34:58 2007
@@ -16,15 +16,7 @@
 
 vpm450m.o: vpm450m.h ../oct612x/include/oct6100api/oct6100_api.h
 
-firmware_oct6114-64d.o: OCT6114-64D.ima base.o
-	@echo Making firmware object file for $<
-	../build_tools/make_firmware_object $< $@ base.o
-
-firmware_oct6114-128d.o: OCT6114-128D.ima base.o
-	@echo Making firmware object file for $<
-	../build_tools/make_firmware_object $< $@ base.o
-
-wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) firmware_oct6114-64d.o firmware_oct6114-128d.o
+wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) ../firmware/zaptel-fw-octasic-064.o ../firmware/zaptel-fw-octasic-128.o
 	$(LD) -r -o $@ $^
 
 clean: