dm: core: Allow dm_warn() to be used in SPL

At present this option is disabled in SPL, meaning that warnings are not
displayed. It is sometimes useful to see warnings in SPL for debugging
purposes.

Add a new Kconfig option to permit this.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index 07d3a6a7a439cce09280d5be8ea471990f68e638..ffae6f9795ff2f4ce2b6f8b08a3063314278b065 100644 (file)
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -40,10 +40,24 @@ config DM_WARN
        depends on DM
        default y
        help
+         Enable this to see warnings related to driver model.
+
+         Warnings may help with debugging, such as when expected devices do
+         not bind correctly. If the option is disabled, dm_warn() is compiled
+         out - it will do nothing when called.
+
+config SPL_DM_WARN
+       bool "Enable warnings in driver model wuth SPL"
+       depends on SPL_DM
+       help
+         Enable this to see warnings related to driver model in SPL
+
          The dm_warn() function can use up quite a bit of space for its
          strings. By default this is disabled for SPL builds to save space.
-         This will cause dm_warn() to be compiled out - it will do nothing
-         when called.
+
+         Warnings may help with debugging, such as when expected devices do
+         not bind correctly. If the option is disabled, dm_warn() is compiled
+         out - it will do nothing when called.
 
 config DM_DEBUG
        bool "Enable debug messages in driver model core"

diff --git a/drivers/core/util.c b/drivers/core/util.c
index 25b0d76f430d7249a4efe15422644e560337d481..91e93b0cf14a4a9aa7feddf20414437cad3fe33c 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -11,7 +11,7 @@
 #include <linux/libfdt.h>
 #include <vsprintf.h>
 
-#ifdef CONFIG_DM_WARN
+#if CONFIG_IS_ENABLED(DM_WARN)
 void dm_warn(const char *fmt, ...)
 {
        va_list args;

diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h
index 31da6215b3ae00a7fae7850e82ee049a03237fd3..af7e3e49fddfc13c73c1ed58a33c8475e9f573ab 100644 (file)
--- a/include/config_uncmd_spl.h
+++ b/include/config_uncmd_spl.h
@@ -16,7 +16,6 @@
 #undef CONFIG_DM_SPI
 #endif
 
-#undef CONFIG_DM_WARN
 #undef CONFIG_DM_STDIO
 
 #endif /* CONFIG_SPL_BUILD */

diff --git a/include/dm/util.h b/include/dm/util.h
index 9773db6de179d11b2fe87ccda1798f8a7f24fa35..01a044992f28cf36e6fbb6efa6799e6720b5b645 100644 (file)
--- a/include/dm/util.h
+++ b/include/dm/util.h
@@ -6,7 +6,7 @@
 #ifndef __DM_UTIL_H
 #define __DM_UTIL_H
 
-#ifdef CONFIG_DM_WARN
+#if CONFIG_IS_ENABLED(DM_WARN)
 void dm_warn(const char *fmt, ...);
 #else
 static inline void dm_warn(const char *fmt, ...)