commit 41c568aba727efbd79a1c5e6e07f918a36452fcd
author Artur Tynecki <artur.tynecki@mobica.com> Tue Feb 08 10:55:24 2022 +0100
committer David Brown <davidb@davidb.org> Tue Mar 08 09:50:01 2022 -0700
tree 793589fa644f7d6197ebc457cf56f556616b36a5
parent a91016672e43946c19de98f97686591b1acb5c6a

mbed: Add enable MCUboot logging parameter and fix logging configuration

This commit add option for a user to enable MCUboot logging from project
configuration level.
Now, logging from MCUboot's sources will be printed in the same way as
mbed-os logs.
Co-created by @AGlass0fMilk - George Beckstein

Signed-off-by: Artur Tynecki <artur.tynecki@mobica.com>
Signed-off-by: George Beckstein <george.beckstein@gmail.com>

boot/mbed/include/mcuboot_config/mcuboot_logging.h

diff --git a/boot/mbed/include/mcuboot_config/mcuboot_logging.h b/boot/mbed/include/mcuboot_config/mcuboot_logging.h
index fc5282e..c6a1cf7 100644
--- a/boot/mbed/include/mcuboot_config/mcuboot_logging.h
+++ b/boot/mbed/include/mcuboot_config/mcuboot_logging.h
@@ -36,13 +36,6 @@
 #define MCUBOOT_LOG_LEVEL MCUBOOT_LOG_LEVEL_OFF
 #endif
 
-#if MCUBOOT_LOG_LEVEL == MCUBOOT_LOG_LEVEL_OFF
-#define MBED_CONF_MBED_TRACE_ENABLE 0
-#else
-#define MBED_CONF_MBED_TRACE_ENABLE 1
-#define MCUBOOT_HAVE_LOGGING
-#endif
-
 #if MCUBOOT_LOG_LEVEL == MCUBOOT_LOG_LEVEL_ERROR
 #define MBED_TRACE_MAX_LEVEL TRACE_LEVEL_ERROR
 #elif MCUBOOT_LOG_LEVEL == MCUBOOT_LOG_LEVEL_WARNING

boot/mbed/mbed_lib.json

diff --git a/boot/mbed/mbed_lib.json b/boot/mbed/mbed_lib.json
index ae8e288..afab39f 100644
--- a/boot/mbed/mbed_lib.json
+++ b/boot/mbed/mbed_lib.json
@@ -64,6 +64,12 @@
             "accepted_values": [true, null],
             "value": null
         },
+        "log-enable": {
+            "help": "Enable MCUboot logging. Must also enable mbed-trace",
+            "macro_name": "MCUBOOT_HAVE_LOGGING",
+            "accepted_values": [true, null],
+            "value": null
+        },
         "log-level": {
             "help": "Verbosity of MCUboot logging.",
             "macro_name": "MCUBOOT_LOG_LEVEL",

boot/mbed/mcuboot_main.cpp

diff --git a/boot/mbed/mcuboot_main.cpp b/boot/mbed/mcuboot_main.cpp
index 4acb34d..bf95e3a 100644
--- a/boot/mbed/mcuboot_main.cpp
+++ b/boot/mbed/mcuboot_main.cpp
@@ -50,10 +50,12 @@
 {
     int rc;
 
+#ifdef MCUBOOT_HAVE_LOGGING
     mbed_trace_init();
 #if MCUBOOT_LOG_BOOTLOADER_ONLY
     mbed_trace_include_filters_set("MCUb,BL");
-#endif
+#endif //MCUBOOT_LOG_BOOTLOADER_ONLY
+#endif //MCUBOOT_HAVE_LOGGING
 
     tr_info("Starting MCUboot");