Merge git://git.denx.de/u-boot-marvell

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

diff --git a/drivers/core/util.c b/drivers/core/util.c
index e01dd06d282c5b5e43490d4826698e9e4e800ddb..24abe1445b9746a25a84dede8c2b86caf5b0c6a1 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -5,8 +5,11 @@
  */
 
 #include <common.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;
@@ -15,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)
 {
@@ -35,3 +30,27 @@ int list_count_items(struct list_head *head)
 
        return count;
 }
+
+bool dm_fdt_pre_reloc(const void *blob, int offset)
+{
+       if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL))
+               return true;
+
+#ifdef CONFIG_TPL_BUILD
+       if (fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL))
+               return true;
+#elif defined(CONFIG_SPL_BUILD)
+       if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL))
+               return true;
+#else
+       /*
+        * In regular builds individual spl and tpl handling both
+        * count as handled pre-relocation for later second init.
+        */
+       if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL) ||
+           fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL))
+               return true;
+#endif
+
+       return false;
+}