Merged revisions 2107 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r2107 | file | 2007-02-07 15:01:41 -0500 (Wed, 07 Feb 2007) | 2 lines

Merge in zaptel-firmware branch. This basically downloads the firmware from the FTP site and builds the appropriate headers based on the current version. Drivers just know they need a certain firmware and get fed the current version. If this prevents your zaptel from building do a make distclean and start fresh or make sure the firmware is checked in make menuselect.

........


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2108 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 7 insertions, 9 deletions

diff --git a/wct4xxp/Kbuild b/wct4xxp/Kbuild
index ea6148b..105ca73 100644
--- a/wct4xxp/Kbuild
+++ b/wct4xxp/Kbuild
@@ -5,19 +5,17 @@ EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(sr
 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-oct6114-064.o ../firmware/zaptel-fw-oct6114-128.o
 endif
 
+$(obj)/../firmware/zaptel-fw-oct6114-064.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-064.o
+
+$(obj)/../firmware/zaptel-fw-oct6114-128.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-128.o
+
 $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
 $(obj)/base.o: $(src)/../zaptel.h
 
 $(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