diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2014-10-20 11:26:38 +0200 |
|---|---|---|
| committer | Jens Wiklander <jens.wiklander@linaro.org> | 2014-11-12 14:21:09 +0100 |
| commit | 4de4bebcfbe3c5c1884a2ff2c66fa2aa5dede662 (patch) | |
| tree | 494e55538bd2154c87f96bec8f127d0561388df2 /ta | |
| parent | 2eb765fcf0b1ca3c4ad7b5449e3f93820174830a (diff) | |
Merge tee_{core,uta}_trace.h into libutil
Merges tee_core_trace.h and tee_uta_trace.h into a common trace.h
in libutil. Since the trace functions now resides libutil they have
to rely on core and libutee to provide functions to print to the
log device.
* Keeps compatible interface from tee_kta_trace.h
* Adds TAMSG() and TAMSG_RAW() to log TA related events
* Removes the TRACE_ALWAYS level
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU virt platform)
Reviewed-by: Etienne Carriere <etienne.carriere@st.com>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (STM platform)
Diffstat (limited to 'ta')
| -rw-r--r-- | ta/arch/arm32/user_ta_header.c | 4 | ||||
| -rw-r--r-- | ta/ta.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ta/arch/arm32/user_ta_header.c b/ta/arch/arm32/user_ta_header.c index 120b40f..8540265 100644 --- a/ta/arch/arm32/user_ta_header.c +++ b/ta/arch/arm32/user_ta_header.c @@ -29,10 +29,10 @@ #include <tee_internal_api_extensions.h> #include <user_ta_header.h> #include <user_ta_header_defines.h> -#include <tee_uta_trace.h> +#include <trace.h> #ifndef TA_TRACE_LEVEL_DEFAULT -#define TA_TRACE_LEVEL_DEFAULT CFG_TEE_TA_LOG_LEVEL +#define TA_TRACE_LEVEL_DEFAULT CFG_TRACE_LEVEL #endif /* exprted to user_ta_header.c, built within TA */ @@ -9,7 +9,7 @@ cflags$(sm) += $(platform-cflags) $(user_ta-platform-cflags) aflags$(sm) += $(platform-aflags) $(user_ta-platform-aflags) # Config flags from mk/config.mk -cppflags$(sm) += -DCFG_TEE_TA_LOG_LEVEL=$(CFG_TEE_TA_LOG_LEVEL) +cppflags$(sm) += -DCFG_TRACE_LEVEL=$(CFG_TEE_TA_LOG_LEVEL) cppflags$(sm) += -DCFG_TEE_CORE_USER_MEM_DEBUG=$(CFG_TEE_CORE_USER_MEM_DEBUG) |