spl: use different BOARD_INIT MACRO for spl and tpl

[u-boot] / drivers / core / util.c

diff --git a/drivers/core/util.c b/drivers/core/util.c
index bd4de7acd69873fc1ebcc1adb069d12282555194..aaaed4ec022586692a9ff9fe87ff885a82a11074 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <dm/util.h>
 #include <libfdt.h>
 #include <vsprintf.h>
 
+#ifdef CONFIG_DM_WARN
 void dm_warn(const char *fmt, ...)
 {
        va_list args;
@@ -16,15 +18,7 @@ void dm_warn(const char *fmt, ...)
        vprintf(fmt, args);
        va_end(args);
 }
-
-void dm_dbg(const char *fmt, ...)
-{
-       va_list args;
-
-       va_start(args, fmt);
-       vprintf(fmt, args);
-       va_end(args);
-}
+#endif
 
 int list_count_items(struct list_head *head)
 {
@@ -37,17 +31,17 @@ int list_count_items(struct list_head *head)
        return count;
 }
 
-int dm_fdt_pre_reloc(const void *blob, int offset)
+bool dm_fdt_pre_reloc(const void *blob, int offset)
 {
        if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL))
-               return 1;
+               return true;
 
 #ifdef CONFIG_TPL_BUILD
        if (fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL))
-               return 1;
+               return true;
 #elif defined(CONFIG_SPL_BUILD)
        if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL))
-               return 1;
+               return true;
 #else
        /*
         * In regular builds individual spl and tpl handling both
@@ -55,8 +49,8 @@ int dm_fdt_pre_reloc(const void *blob, int offset)
         */
        if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL) ||
            fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL))
-               return 1;
+               return true;
 #endif
 
-       return 0;
+       return false;
 }