mcuboot: unify boot log output

Make sure mcuboot zephyr-port log output uses the
common ESP_EARLY_LOG already implemented for
other bootloader initialization calls.

This unify the booting output prefix to commom type:

"I (xx) boot:"

Signed-off-by: Sylvio Alves <[email protected]>

Author: sylvioalves

west/tools.py

@@ -181,10 +181,9 @@ def monitor(self, module_path, args):
         monitor_path = Path(module_path, "tools/idf_monitor/idf_monitor.py")
         cmd_path = Path(os.getcwd())
 
-        # Build command arguments
         cmd = [sys.executable, str(monitor_path), "-p", esp_port, "-b", args.baud, str(elf_path), "--eol", args.eol]
 
-        # Add "-d" flag by default unless explicitly enabled
+        # Adding "-d" argument for idf_monitor.py disables the address decoding
         if not args.enable_address_decoding:
             cmd.append("-d")
 

zephyr/port/include/boot/esp_log.h

@@ -8,6 +8,7 @@
 
 #include "sdkconfig.h"
 #include "mcuboot_config.h"
+#include "esp_log.h"
 
 extern int ets_printf(const char *fmt, ...);
 
@@ -17,30 +18,14 @@ extern int ets_printf(const char *fmt, ...);
 #define MCUBOOT_LOG_LEVEL_INFO     3
 #define MCUBOOT_LOG_LEVEL_DEBUG    4
 
-#if CONFIG_IDF_TARGET_ESP32
-#define TARGET "[esp32]"
-#elif CONFIG_IDF_TARGET_ESP32S2
-#define TARGET "[esp32s2]"
-#elif CONFIG_IDF_TARGET_ESP32S3
-#define TARGET "[esp32s3]"
-#elif CONFIG_IDF_TARGET_ESP32C2
-#define TARGET "[esp32c2]"
-#elif CONFIG_IDF_TARGET_ESP32C3
-#define TARGET "[esp32c3]"
-#elif CONFIG_IDF_TARGET_ESP32C6
-#define TARGET "[esp32c6]"
-#else
-#error "Selected target not supported."
-#endif
-
 #ifndef MCUBOOT_LOG_LEVEL
 #define MCUBOOT_LOG_LEVEL MCUBOOT_LOG_LEVEL_INFO
 #endif
 
 #if MCUBOOT_LOG_LEVEL >= MCUBOOT_LOG_LEVEL_ERROR
 #define MCUBOOT_LOG_ERR(_fmt, ...)                                      \
     do {                                                                \
-            ets_printf(TARGET " [ERR] " _fmt "\n\r", ##__VA_ARGS__);         \
+            ESP_EARLY_LOGE("boot", _fmt "\n\r", ##__VA_ARGS__);         \
     } while (0)
 #else
 #define MCUBOOT_LOG_ERR(_fmt, ...)
@@ -49,7 +34,7 @@ extern int ets_printf(const char *fmt, ...);
 #if MCUBOOT_LOG_LEVEL >= MCUBOOT_LOG_LEVEL_WARNING
 #define MCUBOOT_LOG_WRN(_fmt, ...)                                      \
     do {                                                                \
-            ets_printf(TARGET " [WRN] " _fmt "\n\r", ##__VA_ARGS__);         \
+            ESP_EARLY_LOGW("boot", _fmt "\n\r", ##__VA_ARGS__);         \
     } while (0)
 #else
 #define MCUBOOT_LOG_WRN(_fmt, ...)
@@ -58,7 +43,7 @@ extern int ets_printf(const char *fmt, ...);
 #if MCUBOOT_LOG_LEVEL >= MCUBOOT_LOG_LEVEL_INFO
 #define MCUBOOT_LOG_INF(_fmt, ...)                                      \
     do {                                                                \
-            ets_printf(TARGET " [INF] " _fmt "\n\r", ##__VA_ARGS__);         \
+            ESP_EARLY_LOGI("boot", _fmt "\n\r", ##__VA_ARGS__);         \
     } while (0)
 #else
 #define MCUBOOT_LOG_INF(_fmt, ...)
@@ -67,7 +52,7 @@ extern int ets_printf(const char *fmt, ...);
 #if MCUBOOT_LOG_LEVEL >= MCUBOOT_LOG_LEVEL_DEBUG
 #define MCUBOOT_LOG_DBG(_fmt, ...)                                      \
     do {                                                                \
-            ets_printf(TARGET " [DBG] " _fmt "\n\r", ##__VA_ARGS__);         \
+            ESP_EARLY_LOGD("boot", _fmt "\n\r", ##__VA_ARGS__);         \
     } while (0)
 #else
 #define MCUBOOT_LOG_DBG(_fmt, ...)