From b4a60e1b1e619fc05ff0c6596ee1162acf9923fc Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 9 Dec 2021 05:06:47 +0000 Subject: [PATCH 1/2] Revert "trace: do not set trace_ctx section for Zephyr [REVERTME]" This reverts commit 206df545c47b14f49186d748a6513bd188a20072. Part of the fix for #5032 Signed-off-by: Marc Herbert --- src/include/sof/trace/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/sof/trace/trace.h b/src/include/sof/trace/trace.h index 92463d69d5c0..9693de319a2c 100644 --- a/src/include/sof/trace/trace.h +++ b/src/include/sof/trace/trace.h @@ -379,7 +379,7 @@ struct tr_ctx { uint32_t level; /**< Default log level */ }; -#if defined(UNIT_TEST) || defined(__ZEPHYR__) +#if defined(UNIT_TEST) #define TRACE_CONTEXT_SECTION #else #define TRACE_CONTEXT_SECTION __section(".trace_ctx") From 6a4e615d5e0879365040b3c99853a13b26d679fb Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 9 Dec 2021 05:04:51 +0000 Subject: [PATCH 2/2] Revert "zephyr: fix build after a recent trace filter PR" This reverts commit b31d19b6c2ad3ec51db5f7362ec4acfec86b0317. Part of the fix for #5032 Signed-off-by: Marc Herbert --- src/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trace/trace.c b/src/trace/trace.c index f311d6021950..36b3b721893c 100644 --- a/src/trace/trace.c +++ b/src/trace/trace.c @@ -342,7 +342,7 @@ struct sof_ipc_trace_filter_elem *trace_filter_fill(struct sof_ipc_trace_filter_ static int trace_filter_update_global(int32_t log_level, uint32_t uuid_id) { int cnt = 0; -#if !defined(__ZEPHYR__) && !defined(CONFIG_LIBRARY) +#if !defined(CONFIG_LIBRARY) extern void *_trace_ctx_start; extern void *_trace_ctx_end; struct tr_ctx *ptr = (struct tr_ctx *)&_trace_ctx_start;