# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1384841202 0
# Node ID 60afcd233b047419e2271a363fb37ce5984a58e4
# Parent  df335d255ac4052f2bd2a4dc65f0f642eb851dc2
gsm-fw: first conditionally-built feature: ETM

diff -r df335d255ac4 -r 60afcd233b04 gsm-fw/cfgmagic/feature.etm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/cfgmagic/feature.etm	Tue Nov 19 06:06:42 2013 +0000
@@ -0,0 +1,3 @@
+RVM_ETM_SWE=1
+export_to_c	RVM_ETM_SWE
+export_to_mk	RVM_ETM_SWE
diff -r df335d255ac4 -r 60afcd233b04 gsm-fw/finlink/Makefile
--- a/gsm-fw/finlink/Makefile	Tue Nov 19 05:26:02 2013 +0000
+++ b/gsm-fw/finlink/Makefile	Tue Nov 19 06:06:42 2013 +0000
@@ -9,11 +9,16 @@
 LIBGCC_A=	`${CC} -print-file-name=libgcc.a -mthumb-interwork`
 LIBGCC_T=	`${CC} -print-file-name=libgcc.a -mthumb-interwork -mthumb`
 
+sinclude ../include/config.mk
+
 LOCAL_LIBS=	../riviera/librv.a ../nucleus/libplus.xip.a \
 		../nucleus/libplus.iram.a ../sprintf/libsprintf.a
 
 INT_PIECES=	../bsp/niq32.o
 EXT_PIECES=	../bsp/xipcode.o ../serial/xipcode.o ../sysglue/xipcode.o
+ifeq (${RVM_ETM_SWE},1)
+EXT_PIECES+=	../services/etm/xipcode.o
+endif
 
 all:		${RAM_TARGET}
 ramImage:	${RAM_TARGET}
diff -r df335d255ac4 -r 60afcd233b04 gsm-fw/riviera/init/create_RVtasks.c
--- a/gsm-fw/riviera/init/create_RVtasks.c	Tue Nov 19 05:26:02 2013 +0000
+++ b/gsm-fw/riviera/init/create_RVtasks.c	Tue Nov 19 06:06:42 2013 +0000
@@ -1,28 +1,28 @@
-/*************************************************************************************
- *                                                                                   *
- *  Name        create_RVtasks.c                                                     *
- *                                                                                   *
- *  Function    this file contains functions allowing tasks creation in              *
- *              the Riviera environment                                              *
- *                                                                                   *
- *  Version     0.1                                                                  *
- *                                                                                   *
- *  Date        Modification                                                         *
- *  ------------------------------------                                             *
- *  03 August 2000      Create                                                       *
- *                                                                                   *
- *  Author      Pascal Puel                                                          *
- *                                                                                   *
- * (C) Copyright 2000 by Texas Instruments Incorporated, All Rights Reserved         *
- *                                                                                   *
- * --------------------------------------------------------------------------------- *
- *                                                                                   *
- *   History:                                                                        *
- *                                                                                   *
- *   10/18/2001 - Updated for R2D by Christophe Favergeon                            *
- *   08/28/2002 - Clean-Up by Gerard Cauvy                                           *
- *                                                                                   *
- ************************************************************************************/
+/******************************************************************************
+ *                                                                            *
+ *  Name        create_RVtasks.c                                              *
+ *                                                                            *
+ *  Function    this file contains functions allowing tasks creation in       *
+ *              the Riviera environment                                       *
+ *                                                                            *
+ *  Version     0.1                                                           *
+ *                                                                            *
+ *  Date        Modification                                                  *
+ *  ------------------------------------                                      *
+ *  03 August 2000      Create                                                *
+ *                                                                            *
+ *  Author      Pascal Puel                                                   *
+ *                                                                            *
+ * (C) Copyright 2000 by Texas Instruments Incorporated, All Rights Reserved  *
+ *                                                                            *
+ * -------------------------------------------------------------------------- *
+ *                                                                            *
+ *   History:                                                                 *
+ *                                                                            *
+ *   10/18/2001 - Updated for R2D by Christophe Favergeon                     *
+ *   08/28/2002 - Clean-Up by Gerard Cauvy                                    *
+ *                                                                            *
+ *****************************************************************************/
 
 #include "../../include/config.h"
 
@@ -112,7 +112,7 @@
 
     rvt_register_id("TM", &etm_trace_user_id, etm_receive);
 
-#if (PSP_STANDALONE != 1)
+#if 0 //(PSP_STANDALONE != 1)
     tm_trace_user_id = etm_trace_user_id; // TML1 use the tm_trace_user_id
 #endif
 }