[svn-commits] tzafrir: branch tzafrir/move r3758 - in /team/tzafrir/move: ./ kernel/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Jan 28 17:13:54 2008
New Revision: 3758

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3758
Log:
Basic kernel 2.6 building close to working. Octasidc still fails things.

Added:
    team/tzafrir/move/kernel/digits.h
      - copied unchanged from r3756, team/tzafrir/move/digits.h
    team/tzafrir/move/kernel/makefw.c
      - copied unchanged from r3756, team/tzafrir/move/makefw.c
    team/tzafrir/move/kernel/pciradio.rbt
      - copied unchanged from r3756, team/tzafrir/move/pciradio.rbt
    team/tzafrir/move/kernel/tormenta2.rbt
      - copied unchanged from r3756, team/tzafrir/move/tormenta2.rbt
    team/tzafrir/move/kernel/wcfxo.c
      - copied, changed from r3757, team/tzafrir/move/wcfxo.c
    team/tzafrir/move/kernel/wct1xxp.c
      - copied, changed from r3757, team/tzafrir/move/wct1xxp.c
Removed:
    team/tzafrir/move/digits.h
    team/tzafrir/move/makefw.c
    team/tzafrir/move/pciradio.rbt
    team/tzafrir/move/tormenta2.rbt
    team/tzafrir/move/wcfxo.c
    team/tzafrir/move/wct1xxp.c
Modified:
    team/tzafrir/move/Makefile
    team/tzafrir/move/kernel/Kbuild
    team/tzafrir/move/kernel/zaptel-base.c

Modified: team/tzafrir/move/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/Makefile?view=diff&rev=3758&r1=3757&r2=3758
==============================================================================
--- team/tzafrir/move/Makefile (original)
+++ team/tzafrir/move/Makefile Mon Jan 28 17:13:54 2008
@@ -326,15 +326,6 @@
 
 tonezone.lo: tonezone.c
 	$(CC) -c $(CFLAGS) -o $@ $^
-
-tor2fw.h: tormenta2.rbt makefw 
-	./makefw $< tor2fw > $@
-
-radfw.h: pciradio.rbt makefw
-	./makefw $< radfw > $@
-
-makefw: makefw.c
-	$(HOSTCC) -o $@ $^
 
 prereq: config.status tor2fw.h radfw.h version.h
 

Modified: team/tzafrir/move/kernel/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/Kbuild?view=diff&rev=3758&r1=3757&r2=3758
==============================================================================
--- team/tzafrir/move/kernel/Kbuild (original)
+++ team/tzafrir/move/kernel/Kbuild Mon Jan 28 17:13:54 2008
@@ -28,6 +28,20 @@
 EXTRA_CFLAGS += -DECHO_CAN_HPEC -I$(src)/hpec
 endif
 
+$(obj)/pciradio.o: $(obj)/radfw.h
+$(obj)/tor2.o: $(obj)/tor2fw.h
+
+hostprogs-y := $(obj)/makefw
+
+$(obj)/tor2fw.h: $(src)/tormenta2.rbt $(obj)/makefw 
+	$(obj)/makefw $< tor2fw > $@
+
+$(obj)/radfw.h: $(src)/pciradio.rbt $(obj)/makefw
+	$(obj)/makefw $< radfw > $@
+
+$(obj)/makefw: $(src)/makefw.c
+	$(HOSTCC) -o $@ $^
+
 
 # set CONFIG_ZAPTEL_MMX for a number of CPU types.
 # Right now this part is not enabled, unless you build with

Copied: team/tzafrir/move/kernel/wcfxo.c (from r3757, team/tzafrir/move/wcfxo.c)
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/wcfxo.c?view=diff&rev=3758&p1=team/tzafrir/move/wcfxo.c&r1=3757&p2=team/tzafrir/move/kernel/wcfxo.c&r2=3758
==============================================================================
--- team/tzafrir/move/wcfxo.c (original)
+++ team/tzafrir/move/kernel/wcfxo.c Mon Jan 28 17:13:54 2008
@@ -33,7 +33,7 @@
 #include <linux/pci.h>
 #include <asm/io.h>
 #ifdef STANDALONE_ZAPATA
-#include "kernel/zaptel.h"
+#include "zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif

Copied: team/tzafrir/move/kernel/wct1xxp.c (from r3757, team/tzafrir/move/wct1xxp.c)
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/wct1xxp.c?view=diff&rev=3758&p1=team/tzafrir/move/wct1xxp.c&r1=3757&p2=team/tzafrir/move/kernel/wct1xxp.c&r2=3758
==============================================================================
--- team/tzafrir/move/wct1xxp.c (original)
+++ team/tzafrir/move/kernel/wct1xxp.c Mon Jan 28 17:13:54 2008
@@ -33,7 +33,7 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #ifdef STANDALONE_ZAPATA
-#include "kernel/zaptel.h"
+#include "zaptel.h"
 #else
 #include <zaptel/zaptel.h>
 #endif

Modified: team/tzafrir/move/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/zaptel-base.c?view=diff&rev=3758&r1=3757&r2=3758
==============================================================================
--- team/tzafrir/move/kernel/zaptel-base.c (original)
+++ team/tzafrir/move/kernel/zaptel-base.c Mon Jan 28 17:13:54 2008
@@ -36,7 +36,7 @@
 
 
 #include "zconfig.h"
-#include "version.h"
+#include "../version.h"
 
 #include <linux/kernel.h>
 #include <linux/errno.h>