Merge branch 'master' of git://git.denx.de/u-boot-tegra

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

diff --git a/drivers/core/util.c b/drivers/core/util.c
index bd4de7acd69873fc1ebcc1adb069d12282555194..451d4766d08c7a9db25da13f54f9fa6af52ede1d 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -1,13 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <libfdt.h>
+#include <dm/util.h>
+#include <linux/libfdt.h>
 #include <vsprintf.h>
 
+#ifdef CONFIG_DM_WARN
 void dm_warn(const char *fmt, ...)
 {
        va_list args;
@@ -16,15 +17,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 +30,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 +48,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;
 }