commit 99f1b3630055f54d2f822bc39f7cb3b39d8ad5cf
author David Vincze <david.vincze@arm.com> Thu Dec 12 16:17:35 2019 +0100
committer Ken Liu <ken.liu@arm.com> Thu Dec 26 01:23:29 2019 +0000
tree 00c63a15ae67e282e400d7da70fdf62fe985239c
parent f719f06f8c8d98546bc0b05a0e7a2eae512a0dec

Boot: Move logging macros to project specific file

Move the logging macros to mcuboot_logging.h and add another project
specific mcuboot_config.h file as they are needed to build TF-M with
upstream MCUBoot.

Change-Id: I01d0c6aed028f8e9c6db6acfd290e12afd3dfdc1
Signed-off-by: David Vincze <david.vincze@arm.com>

bl2/ext/mcuboot/bl2_main.c

diff --git a/bl2/ext/mcuboot/bl2_main.c b/bl2/ext/mcuboot/bl2_main.c
index 641fd95..be231b0 100644
--- a/bl2/ext/mcuboot/bl2_main.c
+++ b/bl2/ext/mcuboot/bl2_main.c
@@ -28,7 +28,7 @@
 #include "bl2/include/boot_record.h"
 #include "security_cnt.h"
 #include "bl2/include/boot_hal.h"
-#if BOOT_LOG_LEVEL > BOOT_LOG_LEVEL_OFF
+#if MCUBOOT_LOG_LEVEL > MCUBOOT_LOG_LEVEL_OFF
 #include "uart_stdout.h"
 #endif
 #if defined(CRYPTO_HW_ACCELERATOR) || \
@@ -134,7 +134,7 @@
         BOOT_LOG_ERR("Error while uninitializing Flash Interface");
     }
 
-#if BOOT_LOG_LEVEL > BOOT_LOG_LEVEL_OFF
+#if MCUBOOT_LOG_LEVEL > MCUBOOT_LOG_LEVEL_OFF
     stdio_uninit();
 #endif
 
@@ -166,7 +166,7 @@
     __set_MSPLIM(msp_stack_bottom);
 #endif
 
-#if BOOT_LOG_LEVEL > BOOT_LOG_LEVEL_OFF
+#if MCUBOOT_LOG_LEVEL > MCUBOOT_LOG_LEVEL_OFF
     stdio_init();
 #endif