Commit e5121816 authored by Henrik Brix Andersen's avatar Henrik Brix Andersen Committed by Fabio Utzig
Browse files

boot: zephyr: fix compilation with CONFIG_LOG_MINIMAL=y 



Fix compilation with CONFIG_LOG_MINIMAL enabled by disabling the
custom log handling code.

Fixes e75e33d9

Signed-off-by: default avatarHenrik Brix Andersen <hebad@vestas.com>
parent ac61c2e4

boot/zephyr/main.c

+3 −2
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ const struct boot_uart_funcs boot_funcs = { 
#include <arm_cleanup.h>

#endif



#if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE)

#if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE) && \

    !defined(CONFIG_LOG_MINIMAL)

#ifdef CONFIG_LOG_PROCESS_THREAD

#warning "The log internal thread for log processing can't transfer the log"\

         "well for MCUBoot."
@@ -258,7 +259,7 @@ static void do_boot(struct boot_rsp *rsp) 
#endif



#if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE) &&\

    !defined(CONFIG_LOG_PROCESS_THREAD)

    !defined(CONFIG_LOG_PROCESS_THREAD) && !defined(CONFIG_LOG_MINIMAL)

/* The log internal thread for log processing can't transfer log well as has too

 * low priority.

 * Dedicated thread for log processing below uses highest application

CRA Git | Maintained and supported by SUSTech CRA and CCSE