LIB: Partially rework BL2 logging

Instead of verifying that the LOG_LEVEL matches the MCUBOOT_LOG_LEVEL,
completely ignore the definition of LOG_LEVEL for MCUBoot logging and
ensure that instead we only use the MCUBOOT_LOG_LEVEL macro to determine
the level to log at.

We achieve this by setting the LOG_LEVEL to LOG_LEVEL_VERBOSE which
compiles in all logging macros and allow the MCUBOOT_LOG_LEVEL to set
which level to log at.

Change-Id: I343774306734499b691fde04cd87626ff6d13add
Signed-off-by: Jackson Cooper-Driver <jackson.cooper-driver@arm.com>
(cherry picked from commit 1fe05e9)
Signed-off-by: Stefan Gloor <stefan.gloor@siemens.com>

Author: jackson-cooperd

bl2/ext/mcuboot/include/mcuboot_config/mcuboot_logging.h

@@ -19,6 +19,16 @@
 #define __MCUBOOT_LOGGING_H__
 
 #include "bootutil/ignore.h"
+
+/*
+ * MCUBoot uses MCUBOOT_LOG_LEVEL to specify the log level
+ * but tfm_log.h requires the definition of LOG_LEVEL. Define
+ * the maximum possible LOG_LEVEL which ensures that all
+ * macros are valid. MCUBoot can then use its log level
+ * to determine what to log.
+ */
+#undef LOG_LEVEL
+#define LOG_LEVEL LOG_LEVEL_VERBOSE
 #include "tfm_log.h"
 
 #ifdef __cplusplus
@@ -31,26 +41,40 @@ extern "C" {
 #define MCUBOOT_LOG_LEVEL_INFO      LOG_LEVEL_INFO
 #define MCUBOOT_LOG_LEVEL_DEBUG     LOG_LEVEL_VERBOSE
 
-#if defined(MCUBOOT_LOG_LEVEL) && (MCUBOOT_LOG_LEVEL != LOG_LEVEL)
-#error "MCUBOOT_LOG_LEVEL does not match LOG_LEVEL"
-#elif !defined(MCUBOOT_LOG_LEVEL)
-#define MCUBOOT_LOG_LEVEL LOG_LEVEL
+#ifndef MCUBOOT_LOG_LEVEL
+#define MCUBOOT_LOG_LEVEL           MCUBOOT_LOG_LEVEL_INFO
 #endif
 
 #define MCUBOOT_LOG_MODULE_DECLARE(domain)      /* Ignore */
 #define MCUBOOT_LOG_MODULE_REGISTER(domain)     /* Ignore */
 
-#define MCUBOOT_LOG_ERR(_fmt, ...) \
+#if MCUBOOT_LOG_LEVEL >= MCUBOOT_LOG_LEVEL_ERROR
+#define MCUBOOT_LOG_ERR(_fmt, ...)                  \
     ERROR(_fmt "\n", ##__VA_ARGS__)
+#else
+#define MCUBOOT_LOG_ERR(...) IGNORE(__VA_ARGS__)
+#endif
 
-#define MCUBOOT_LOG_WRN(_fmt, ...) \
+#if MCUBOOT_LOG_LEVEL >= MCUBOOT_LOG_LEVEL_WARNING
+#define MCUBOOT_LOG_WRN(_fmt, ...)                  \
     WARN(_fmt "\n", ##__VA_ARGS__)
+#else
+#define MCUBOOT_LOG_WRN(...) IGNORE(__VA_ARGS__)
+#endif
 
-#define MCUBOOT_LOG_INF(_fmt, ...) \
+#if MCUBOOT_LOG_LEVEL >= MCUBOOT_LOG_LEVEL_INFO
+#define MCUBOOT_LOG_INF(_fmt, ...)                  \
     INFO(_fmt "\n", ##__VA_ARGS__)
+#else
+#define MCUBOOT_LOG_INF(...) IGNORE(__VA_ARGS__)
+#endif
 
-#define MCUBOOT_LOG_DBG(_fmt, ...) \
+#if MCUBOOT_LOG_LEVEL >= MCUBOOT_LOG_LEVEL_DEBUG
+#define MCUBOOT_LOG_DBG(_fmt, ...)                  \
     VERBOSE(_fmt "\n", ##__VA_ARGS__)
+#else
+#define MCUBOOT_LOG_DBG(...) IGNORE(__VA_ARGS__)
+#endif
 
 #ifdef __cplusplus
 }

secure_fw/partitions/firmware_update/bootloader/mcuboot/CMakeLists.txt

@@ -44,5 +44,4 @@ target_compile_definitions(tfm_psa_rot_partition_fwu
     PRIVATE
         MCUBOOT_${MCUBOOT_UPGRADE_STRATEGY}
         $<$<BOOL:${MCUBOOT_DIRECT_XIP_REVERT}>:MCUBOOT_DIRECT_XIP_REVERT>
-        LOG_LEVEL=${BL2_LOG_LEVEL}
 )