Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-riscv into...

[J-u-boot.git] / include / log.h

diff --git a/include/log.h b/include/log.h
index 69dcb339543cab1ea4018ee8d41520804a1385ae..4f6d6a2c2cf8c31b372667d43e48e75ad42e5d27 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -104,6 +104,10 @@ enum log_category_t {
        LOGC_FS,
        /** @LOGC_EXPO: Related to expo handling */
        LOGC_EXPO,
+       /** @LOGC_CONSOLE: Related to the console and stdio */
+       LOGC_CONSOLE,
+       /** @LOGC_TEST: Related to testing */
+       LOGC_TEST,
        /** @LOGC_COUNT: Number of log categories */
        LOGC_COUNT,
        /** @LOGC_END: Sentinel value for lists of log categories */
@@ -244,10 +248,10 @@ int _log_buffer(enum log_category_t cat, enum log_level_t level,
 #define _DEBUG 0
 #endif
 
-#ifdef CONFIG_SPL_BUILD
-#define _SPL_BUILD     1
+#ifdef CONFIG_XPL_BUILD
+#define _XPL_BUILD     1
 #else
-#define _SPL_BUILD     0
+#define _XPL_BUILD     0
 #endif
 
 #if CONFIG_IS_ENABLED(LOG)
@@ -279,9 +283,9 @@ int _log_buffer(enum log_category_t cat, enum log_level_t level,
 #define debug(fmt, args...)                    \
        debug_cond(_DEBUG, fmt, ##args)
 
-/* Show a message if not in SPL */
-#define warn_non_spl(fmt, args...)                     \
-       debug_cond(!_SPL_BUILD, fmt, ##args)
+/* Show a message if not in xPL */
+#define warn_non_xpl(fmt, args...)                     \
+       debug_cond(!_XPL_BUILD, fmt, ##args)
 
 /*
  * An assertion is run-time check done in debug mode only. If DEBUG is not