Commit 5b7ed6a8 authored by Dominik Ermel's avatar Dominik Ermel Committed by Andrzej Puzdrowski
Browse files

boot: zephyr: Fix compilation warnings with ZEPHYR_LOG_MODE_MINIMAL 



The commit fixes definition and usage of ZEPHYR_LOG_MODE_MINIMAL
to prevent compilation warnings on possibly non-portable code.

Signed-off-by: default avatarDominik Ermel <dominik.ermel@nordicsemi.no>
parent d602ed85

boot/zephyr/main.c

+6 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2014 Wind River Systems, Inc.

 * Copyright (c) 2020 Arm Limited

 * Copyright (c) 2021 Nordic Semiconductor ASA

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -54,11 +55,12 @@ const struct boot_uart_funcs boot_funcs = { 
/* CONFIG_LOG_MINIMAL is the legacy Kconfig property,

 * replaced by CONFIG_LOG_MODE_MINIMAL.

 */

#define ZEPHYR_LOG_MODE_MINIMAL (defined(CONFIG_LOG_MODE_MINIMAL) ||\

                                 defined(CONFIG_LOG_MINIMAL))

#if (defined(CONFIG_LOG_MODE_MINIMAL) || defined(CONFIG_LOG_MINIMAL))

#define ZEPHYR_LOG_MODE_MINIMAL 1

#endif



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

    !ZEPHYR_LOG_MODE_MINIMAL

    !defined(ZEPHYR_LOG_MODE_MINIMAL)

#ifdef CONFIG_LOG_PROCESS_THREAD

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

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



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

    !defined(CONFIG_LOG_PROCESS_THREAD) && !ZEPHYR_LOG_MODE_MINIMAL

    !defined(CONFIG_LOG_PROCESS_THREAD) && !defined(ZEPHYR_LOG_MODE_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