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 27a68487034e182331ece2ed2244ebf685bd5a79..7dc1a2af0282cf7ddecc749dc66fc3bc8851051c 100644 (file)
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -31,42 +31,21 @@ 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;
-}
-
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 bool dm_ofnode_pre_reloc(ofnode node)
 {
+#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;
-
-#ifdef CONFIG_TPL_BUILD
-       if (ofnode_read_bool(node, "u-boot,dm-tpl"))
-               return true;
-#elif defined(CONFIG_SPL_BUILD)
-       if (ofnode_read_bool(node, "u-boot,dm-spl"))
+       if (ofnode_read_bool(node, "u-boot,dm-pre-proper"))
                return true;
-#else
+
        /*
         * In regular builds individual spl and tpl handling both
         * count as handled pre-relocation for later second init.
@@ -74,7 +53,8 @@ bool dm_ofnode_pre_reloc(ofnode node)
        if (ofnode_read_bool(node, "u-boot,dm-spl") ||
            ofnode_read_bool(node, "u-boot,dm-tpl"))
                return true;
-#endif
 
        return false;
+#endif
 }
+#endif