--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/tpudrv/Makefile	Mon Aug 11 06:32:10 2014 +0000
@@ -0,0 +1,12 @@
+CC=	arm-elf-gcc
+CPPFLAGS=-I../../include -I../include -I../audio_include -I../audio_cust0 \
+	-I../tm_include -I../tm_cust0 -I../cust0
+CFLAGS=	-O2 -fno-builtin -mthumb-interwork
+LD=	arm-elf-ld
+
+OBJS=	tpudrv.o
+
+all:	${OBJS}
+
+clean:
+	rm -f *.[oa] *.out *errs

--- a/gsm-fw/L1/tpudrv/tpudrv.c	Mon Aug 11 04:45:42 2014 +0000
+++ b/gsm-fw/L1/tpudrv/tpudrv.c	Mon Aug 11 06:32:10 2014 +0000
@@ -15,9 +15,10 @@
  *
  */
 
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "iq.h"
-#include "l1_confg.h"
+#include "../../bsp/iq.h"
 #include "l1_const.h"
 #include "l1_types.h"
 
@@ -56,7 +57,7 @@
 #include "l1_defty.h"
 #include "tpudrv.h"
 #include "sys_types.h"
-#include "clkm.h"
+#include "../../bsp/clkm.h"
 #include "l1_time.h"
 #include "l1_varex.h"
 #include "l1_trace.h"
@@ -264,7 +265,7 @@
    {
       *TP_Ptr++ = *src++;
    }
-   #if (TOOL_CHOICE == 3)   // 2.54 Migration
+   #if 1 //(TOOL_CHOICE == 3)   // 2.54 Migration
    return((void *)NULL);
    #endif // TOOL_CHOICE == 3
     //  return((void *)NULL);//ompas00090550
@@ -393,7 +394,7 @@
 void l1dmacro_adc_read_rx(void)
 {
 
-  #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
      // TSP needs to be configured in order to send serially to Omega
 
 //   *TP_Ptr++ = TPU_MOVE  (TSP_SPI_SET1, TSP_CLK_RISE); // Clock configuration
@@ -415,7 +416,7 @@
   #endif
 
 #if (L1_MADC_ON == 1)
-  #if (ANLG_FAM == 11)
+  #if (ANALOG == 11)
 
      #if (TRACE_TYPE==1)||(TRACE_TYPE ==4)
        #if (GSM_IDLE_RAM == 0)
@@ -456,7 +457,7 @@
           *TP_Ptr++ = TPU_MOVE(REG_SPI_ACT_U,0);
 
 #if (L1_MADC_ON == 1)
-  #if (ANLG_FAM == 11)
+  #if (ANALOG == 11)
 
      #if (TRACE_TYPE==1)||(TRACE_TYPE ==4)
        #if (GSM_IDLE_RAM == 0)
@@ -484,14 +485,14 @@
  */
 
 
-#if (ANLG_FAM != 11)
+#if (ANALOG != 11)
 void l1dmacro_adc_read_tx(UWORD32 when)
 #else
 void l1dmacro_adc_read_tx(UWORD32 when, UWORD8 tx_up_state)
 #endif
 {
 
-  #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
+  #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
 
      *TP_Ptr++ = TPU_FAT (when);
      *TP_Ptr++ = TPU_MOVE  (TSP_CTRL1,6);                // Device and Nb of bits configuration
@@ -507,7 +508,7 @@
   #endif
 
 #if (L1_MADC_ON == 1)
-  #if (ANLG_FAM == 11)
+  #if (ANALOG == 11)
      *TP_Ptr++ = TPU_FAT (when);
      *TP_Ptr++ = TPU_MOVE(REG_SPI_ACT_U,tx_up_state | START_ADC);
      *TP_Ptr++ = TPU_WAIT  (2);