[svn-commits] file: trunk r1570 - /trunk/wct4xxp/Kbuild

svn-commits at lists.digium.com svn-commits at lists.digium.com
Tue Nov 7 22:08:32 MST 2006


Author: file
Date: Tue Nov  7 23:08:31 2006
New Revision: 1570

URL: http://svn.digium.com/view/zaptel?rev=1570&view=rev
Log:
Don't build the firmware headers unless needed. This shaves ~3.5 seconds off build time.

Modified:
    trunk/wct4xxp/Kbuild

Modified: trunk/wct4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/Kbuild?rev=1570&r1=1569&r2=1570&view=diff
==============================================================================
--- trunk/wct4xxp/Kbuild (original)
+++ trunk/wct4xxp/Kbuild Tue Nov  7 23:08:31 2006
@@ -1,7 +1,21 @@
 # yes, this is redundant... the Kbuild system is changing to hostprogs-y,
 # but we need to be able to support older verions as well
+
+# If hotplug firmware loading is disabled, do our header based stuff
+ifeq ($(HOTPLUG_FIRMWARE),no)
+
 host-progs := fw2h
 hostprogs-y := fw2h
+
+FIRMWARE := $(obj)/vpmoct128_fw.h $(obj)/vpmoct064_fw.h
+
+$(obj)/vpmoct128_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h
+	$(obj)/fw2h $< $@
+
+$(obj)/vpmoct064_fw.h: $(src)/OCT6114-64D.ima $(obj)/fw2h
+	$(obj)/fw2h $< $@
+
+endif
 
 obj-m += wct4xxp.o
 
@@ -12,13 +26,7 @@
 $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
 $(obj)/base.o: $(src)/../zaptel.h
 
-$(obj)/vpm450m.o: $(obj)/vpmoct128_fw.h $(obj)/vpmoct064_fw.h $(src)/vpm450m.h
+$(obj)/vpm450m.o: $(FIRMWARE) $(src)/vpm450m.h
 $(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
 
-$(obj)/vpmoct128_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h
-	$(obj)/fw2h $< $@
-
-$(obj)/vpmoct064_fw.h: $(src)/OCT6114-64D.ima $(obj)/fw2h
-	$(obj)/fw2h $< $@
-
 clean-files := vpmoct128_fw.h vpmoct064_fw.h



More information about the svn-commits mailing list