X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=drivers%2Fcore%2Futil.c;h=2e232d57a14fac2db666586beb82796db241c2d1;hb=8d3a25685e4aac7070365a2b3c53c2c81b27930f;hp=e01dd06d282c5b5e43490d4826698e9e4e800ddb;hpb=5495dae7aa9d5cd161e07174d38acac86515c58a;p=platform%2Fkernel%2Fu-boot.git

diff --git a/drivers/core/util.c b/drivers/core/util.c
index e01dd06..2e232d5 100644
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -5,8 +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;
@@ -15,7 +18,9 @@ void dm_warn(const char *fmt, ...)
 	vprintf(fmt, args);
 	va_end(args);
 }
+#endif
 
+#ifdef DEBUG
 void dm_dbg(const char *fmt, ...)
 {
 	va_list args;
@@ -24,6 +29,7 @@ void dm_dbg(const char *fmt, ...)
 	vprintf(fmt, args);
 	va_end(args);
 }
+#endif
 
 int list_count_items(struct list_head *head)
 {
@@ -35,3 +41,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;
+}