Skip to content

Commit e512181

Browse files
henrikbrixandersenutzig
authored andcommitted
boot: zephyr: fix compilation with CONFIG_LOG_MINIMAL=y
Fix compilation with CONFIG_LOG_MINIMAL enabled by disabling the custom log handling code. Fixes e75e33d Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
1 parent ac61c2e commit e512181

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

boot/zephyr/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ const struct boot_uart_funcs boot_funcs = {
5151
#include <arm_cleanup.h>
5252
#endif
5353

54-
#if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE)
54+
#if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE) && \
55+
!defined(CONFIG_LOG_MINIMAL)
5556
#ifdef CONFIG_LOG_PROCESS_THREAD
5657
#warning "The log internal thread for log processing can't transfer the log"\
5758
"well for MCUBoot."
@@ -258,7 +259,7 @@ static void do_boot(struct boot_rsp *rsp)
258259
#endif
259260

260261
#if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE) &&\
261-
!defined(CONFIG_LOG_PROCESS_THREAD)
262+
!defined(CONFIG_LOG_PROCESS_THREAD) && !defined(CONFIG_LOG_MINIMAL)
262263
/* The log internal thread for log processing can't transfer log well as has too
263264
* low priority.
264265
* Dedicated thread for log processing below uses highest application

0 commit comments

Comments
 (0)