OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

boot: bootutil: include mcuboot_logging.h unconditionally 

The mcuboot_logging.h header includes the header for the log subystem,
which needs to be included regardless of whether logging is enabled
for logging macros to compile correctly.

Signed-off-by: Emanuele Di Santo <emdi@nordicsemi.no>
This commit is contained in:
Emanuele Di Santo 2019-01-08 13:20:16 +01:00 committed by Andrzej Puzdrowski
parent 7c00acd737
commit 0752d8aee4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot/bootutil/include/bootutil/bootutil_log.h
View File

@ -24,6 +24,7 @@ extern "C" {
#endif #endif
#include <mcuboot_config/mcuboot_config.h> #include <mcuboot_config/mcuboot_config.h>
#include <mcuboot_config/mcuboot_logging.h>
#ifdef MCUBOOT_HAVE_LOGGING #ifdef MCUBOOT_HAVE_LOGGING
@ -37,8 +38,6 @@ extern "C" {
#define BOOT_LOG_LEVEL_INFO MCUBOOT_LOG_LEVEL_INFO #define BOOT_LOG_LEVEL_INFO MCUBOOT_LOG_LEVEL_INFO
#define BOOT_LOG_LEVEL_DEBUG MCUBOOT_LOG_LEVEL_DEBUG #define BOOT_LOG_LEVEL_DEBUG MCUBOOT_LOG_LEVEL_DEBUG
#include <mcuboot_config/mcuboot_logging.h>
#define BOOT_LOG_ERR(...) MCUBOOT_LOG_ERR(__VA_ARGS__) #define BOOT_LOG_ERR(...) MCUBOOT_LOG_ERR(__VA_ARGS__)
#define BOOT_LOG_WRN(...) MCUBOOT_LOG_WRN(__VA_ARGS__) #define BOOT_LOG_WRN(...) MCUBOOT_LOG_WRN(__VA_ARGS__)
#define BOOT_LOG_INF(...) MCUBOOT_LOG_INF(__VA_ARGS__) #define BOOT_LOG_INF(...) MCUBOOT_LOG_INF(__VA_ARGS__)