[zaptel-commits] tzafrir: branch tzafrir/kernelmove_14 r2699 - in /team/tzafrir/kernelmove_14:...

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Thu Jul  5 14:25:51 2007
New Revision: 2699

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2699
Log:
* Fix building wct4xxp and wctcrxxp when the firmware is hotpluggable.
* Remove false dependency for firmware module building (for providing arch).

Modified:
    team/tzafrir/kernelmove_14/firmware/Makefile
    team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26
    team/tzafrir/kernelmove_14/kernel/wctc4xxp/Makefile.kernel26

Modified: team/tzafrir/kernelmove_14/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/firmware/Makefile?view=diff&rev=2699&r1=2698&r2=2699
==============================================================================
--- team/tzafrir/kernelmove_14/firmware/Makefile (original)
+++ team/tzafrir/kernelmove_14/firmware/Makefile Thu Jul  5 14:25:51 2007
@@ -165,6 +165,6 @@
 	../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@
 
 # Build object file of a TC400M firmware image for linking
-zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz ../wctc4xxp/base.o zaptel-fw-tc400m.bin
+zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz 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_tools/make_firmware_object zaptel-fw-tc400m.bin $@

Modified: team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26?view=diff&rev=2699&r1=2698&r2=2699
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26 (original)
+++ team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26 Thu Jul  5 14:25:51 2007
@@ -5,11 +5,13 @@
 
 EXTRA_CFLAGS := -I$(src)/.. $(OCT_CFLAGS) -Wno-undef -DSTANDALONE_ZAPATA 
 
-wct4xxp-objs := base.o vpm450m.o $(OCT_OBJS)
-
-ifneq ($(HOTPLUG_FIRMWARE),yes)
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+EXTRA_CFLAGS	+= -DHOTPLUG_FIRMWARE
+else
 wct4xxp-objs += $(obj)/../../firmware/zaptel-fw-oct6114-064.o $(obj)/../../firmware/zaptel-fw-oct6114-128.o
 endif
+
+wct4xxp-objs := base.o vpm450m.o $(OCT_OBJS)
 
 $(obj)/../firmware/zaptel-fw-oct6114-064.o: $(obj)/base.o
 	$(MAKE) -C $(obj)/../../firmware zaptel-fw-oct6114-064.o

Modified: team/tzafrir/kernelmove_14/kernel/wctc4xxp/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wctc4xxp/Makefile.kernel26?view=diff&rev=2699&r1=2698&r2=2699
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wctc4xxp/Makefile.kernel26 (original)
+++ team/tzafrir/kernelmove_14/kernel/wctc4xxp/Makefile.kernel26 Thu Jul  5 14:25:51 2007
@@ -2,12 +2,13 @@
 
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef -DSTANDALONE_ZAPATA 
 
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+EXTRA_CFLAGS	+= -DHOTPLUG_FIRMWARE
+else
+wctc4xxp-objs	+= ../firmware/zaptel-fw-tc400m.o
+endif
 
 wctc4xxp-objs := base.o 
-
-ifneq ($(HOTPLUG_FIRMWARE),yes)
-wctc4xxp-objs += ../firmware/zaptel-fw-tc400m.o
-endif
 
 $(obj)/base.o: $(src)/../zaptel.h