# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1602749787 0
# Node ID 8cf3029429f33a504a7671456359b95b97db5c8a
# Parent  b1ece12237b20ce413e2b10bf7cea14375772752
allow TI_PROFILER to be enabled

diff -r b1ece12237b2 -r 8cf3029429f3 components/bootloader
--- a/components/bootloader	Wed Oct 14 01:18:45 2020 +0000
+++ b/components/bootloader	Thu Oct 15 08:16:27 2020 +0000
@@ -11,7 +11,7 @@
 ASMFLAGS="$ASMFLAGS -dTOOL_CHOICE=0"
 ASMFLAGS="$ASMFLAGS -dR2D_ASM=0"
 ASMFLAGS="$ASMFLAGS -dR2D_LCD_TEST=0"
-ASMFLAGS="$ASMFLAGS -dTI_PROFILER=0"
+ASMFLAGS="$ASMFLAGS -dTI_PROFILER=$TI_PROFILER"
 ASMFLAGS="$ASMFLAGS -dTI_NUC_MONITOR=0"
 ASMFLAGS="$ASMFLAGS -dL1_GPRS=$GPRS"
 ASMFLAGS="$ASMFLAGS -dOP_WCP=0"
@@ -33,7 +33,7 @@
 ASMFLAGS="$ASMFLAGS -dTOOL_CHOICE=0"
 ASMFLAGS="$ASMFLAGS -dR2D_ASM=0"
 ASMFLAGS="$ASMFLAGS -dR2D_LCD_TEST=0"
-ASMFLAGS="$ASMFLAGS -dTI_PROFILER=0"
+ASMFLAGS="$ASMFLAGS -dTI_PROFILER=$TI_PROFILER"
 ASMFLAGS="$ASMFLAGS -dTI_NUC_MONITOR=0"
 ASMFLAGS="$ASMFLAGS -dL1_GPRS=$GPRS"
 ASMFLAGS="$ASMFLAGS -dOP_WCP=0"
diff -r b1ece12237b2 -r 8cf3029429f3 components/main-init
--- a/components/main-init	Wed Oct 14 01:18:45 2020 +0000
+++ b/components/main-init	Thu Oct 15 08:16:27 2020 +0000
@@ -72,7 +72,7 @@
 ASMFLAGS="$ASMFLAGS -dTOOL_CHOICE=0"
 ASMFLAGS="$ASMFLAGS -dR2D_ASM=0"
 ASMFLAGS="$ASMFLAGS -dR2D_LCD_TEST=0"
-ASMFLAGS="$ASMFLAGS -dTI_PROFILER=0"
+ASMFLAGS="$ASMFLAGS -dTI_PROFILER=$TI_PROFILER"
 ASMFLAGS="$ASMFLAGS -dTI_NUC_MONITOR=0"
 ASMFLAGS="$ASMFLAGS -dL1_GPRS=$GPRS"
 ASMFLAGS="$ASMFLAGS -dOP_WCP=0"
diff -r b1ece12237b2 -r 8cf3029429f3 configure.sh
--- a/configure.sh	Wed Oct 14 01:18:45 2020 +0000
+++ b/configure.sh	Thu Oct 15 08:16:27 2020 +0000
@@ -118,6 +118,7 @@
 
 ALLOW_CSIM_GSM=1
 SERIAL_DYNAMIC_SWITCH=0
+TI_PROFILER=0
 TRACEMASK_IN_FFS=0
 TR_BAUD_CONFIG=TR_BAUD_115200
 USE_STR2IND=0
@@ -229,7 +230,7 @@
 export DISABLE_SLEEP
 export DSAMPLE_FULL_COLOR RVTMUX_ON_MODEM UI_CONFIG
 export ALLOW_CSIM_GSM SERIAL_DYNAMIC_SWITCH TR_BAUD_CONFIG
-export TRACEMASK_IN_FFS
+export TI_PROFILER TRACEMASK_IN_FFS
 
 SUBDIR=
 LIBS=
diff -r b1ece12237b2 -r 8cf3029429f3 scripts/cfg-template
--- a/scripts/cfg-template	Wed Oct 14 01:18:45 2020 +0000
+++ b/scripts/cfg-template	Thu Oct 15 08:16:27 2020 +0000
@@ -12,7 +12,7 @@
 [debug.cfg]
 
 TI_NUC_MONITOR 0
-TI_PROFILER 0
+TI_PROFILER var
 
 [dio.cfg]
 
diff -r b1ece12237b2 -r 8cf3029429f3 scripts/config-headers-new.sh
--- a/scripts/config-headers-new.sh	Wed Oct 14 01:18:45 2020 +0000
+++ b/scripts/config-headers-new.sh	Thu Oct 15 08:16:27 2020 +0000
@@ -118,6 +118,12 @@
 fi
 export DSAMPLE_FULL_COLOR
 
+if [ -z "$TI_PROFILER" ]
+then
+	TI_PROFILER=0
+fi
+export TI_PROFILER
+
 if [ -z "$TR_BAUD_CONFIG" ]
 then
 	TR_BAUD_CONFIG=TR_BAUD_115200
diff -r b1ece12237b2 -r 8cf3029429f3 scripts/mkcomp-test.sh
--- a/scripts/mkcomp-test.sh	Wed Oct 14 01:18:45 2020 +0000
+++ b/scripts/mkcomp-test.sh	Thu Oct 15 08:16:27 2020 +0000
@@ -30,6 +30,11 @@
 	L1_DYN_DSP_DWNLD=1
 fi
 
+if [ -z "$TI_PROFILER" ]
+then
+	TI_PROFILER=0
+fi
+
 if [ -z "$TCSENV" ]
 then
 	TCSENV=2
@@ -65,6 +70,6 @@
 SRVC=1
 
 export ACI BUILD_DIR CDGINC CDGPRIM CHIPSET CONDAT DSP GPF GPRS
-export L1_DYN_DSP_DWNLD MMI RF SRVC USE_STR2IND
+export L1_DYN_DSP_DWNLD MMI RF SRVC TI_PROFILER USE_STR2IND
 
 exec scripts/mk-component.sh "$@"
diff -r b1ece12237b2 -r 8cf3029429f3 src/cs/riviera/rvt/ti_profiler/ti_profiler.c
--- a/src/cs/riviera/rvt/ti_profiler/ti_profiler.c	Wed Oct 14 01:18:45 2020 +0000
+++ b/src/cs/riviera/rvt/ti_profiler/ti_profiler.c	Thu Oct 15 08:16:27 2020 +0000
@@ -23,8 +23,10 @@
   #include "main/sys_types.h"
 
   #include "nucleus.h" 
-  #include "qu_defs.h" 
-  #include "tc_defs.h" 
+  #if (TI_NUC_MONITOR == 1)
+    #include "qu_defs.h" 
+    #include "tc_defs.h" 
+  #endif
 
   #include "rvf/rvf_api.h"
   #include "rvt/rvt_gen.h"
diff -r b1ece12237b2 -r 8cf3029429f3 src/cs/system/main/int.s
--- a/src/cs/system/main/int.s	Wed Oct 14 01:18:45 2020 +0000
+++ b/src/cs/system/main/int.s	Thu Oct 15 08:16:27 2020 +0000
@@ -1545,7 +1545,7 @@
 ;
      .if TI_NUC_MONITOR = 1
 ; define a new section to be mapped independently
-        .sect ".irqtext"
+;       .sect ".irqtext"
              
         .def    _INT_IRQ
 		.global _INT_IRQ
@@ -1624,7 +1624,7 @@
 ;
      .if TI_PROFILER = 1
 ; define a new section to be mapped independently
-        .sect ".fiqtext"
+;       .sect ".fiqtext"
              
         .def    _INT_FIQ
 		.global _INT_FIQ