FreeCalypso > hg > fc-magnetite
changeset 690:8cf3029429f3
allow TI_PROFILER to be enabled
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Thu, 15 Oct 2020 08:16:27 +0000 |
| parents | b1ece12237b2 |
| children | b7b809c62586 |
| files | components/bootloader components/main-init configure.sh scripts/cfg-template scripts/config-headers-new.sh scripts/mkcomp-test.sh src/cs/riviera/rvt/ti_profiler/ti_profiler.c src/cs/system/main/int.s |
| diffstat | 8 files changed, 24 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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"
--- 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=
--- 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]
--- 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
--- 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 "$@"
--- 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"
--- 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