configs: Add sam9x60ek_mmc_defconfig

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

diff --git a/drivers/core/util.c b/drivers/core/util.c
index bd4de7acd69873fc1ebcc1adb069d12282555194..7dc1a2af0282cf7ddecc749dc66fc3bc8851051c 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -1,13 +1,15 @@
+// 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/ofnode.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 +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,26 +31,30 @@ int list_count_items(struct list_head *head)
        return count;
 }
 
-int dm_fdt_pre_reloc(const void *blob, int offset)
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
+bool dm_ofnode_pre_reloc(ofnode node)
 {
-       if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL))
-               return 1;
-
-#ifdef CONFIG_TPL_BUILD
-       if (fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL))
-               return 1;
-#elif defined(CONFIG_SPL_BUILD)
-       if (fdt_getprop(blob, offset, "u-boot,dm-spl", NULL))
-               return 1;
+#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD)
+       /* for SPL and TPL the remaining nodes after the fdtgrep 1st pass
+        * had property dm-pre-reloc or u-boot,dm-spl/tpl.
+        * They are removed in final dtb (fdtgrep 2nd pass)
+        */
+       return true;
 #else
+       if (ofnode_read_bool(node, "u-boot,dm-pre-reloc"))
+               return true;
+       if (ofnode_read_bool(node, "u-boot,dm-pre-proper"))
+               return true;
+
        /*
         * 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 1;
-#endif
+       if (ofnode_read_bool(node, "u-boot,dm-spl") ||
+           ofnode_read_bool(node, "u-boot,dm-tpl"))
+               return true;
 
-       return 0;
+       return false;
+#endif
 }
+#endif