commit 8d7e8160449a9a973a42443729b03ef91f240715
author Simon Glass <sjg@chromium.org> Mon Jul 04 11:57:58 2016 -0600
committer Simon Glass <sjg@chromium.org> Thu Jul 14 20:40:24 2016 -0600
tree 4254d41ba3eb1705f5fcea51a4ef1950093030e3
parent abbe8259c00bbc8934a3057a311e13af0b98e983

dm: core: Don't use device tree with of-platdata

When CONFIG_SPL_OF_PLATDATA is enabled we should not access the device
tree. Remove all references to this in the core driver-model code.

Signed-off-by: Simon Glass <sjg@chromium.org>

drivers/core/root.c

diff --git a/drivers/core/root.c b/drivers/core/root.c
index 95886ad..1587024 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -188,7 +188,7 @@
 	return ret;
 }
 
-#if CONFIG_IS_ENABLED(OF_CONTROL)
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset,
 		     bool pre_reloc_only)
 {
@@ -244,7 +244,7 @@
 		return ret;
 	}
 
-	if (CONFIG_IS_ENABLED(OF_CONTROL)) {
+	if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
 		ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only);
 		if (ret) {
 			debug("dm_scan_fdt() failed: %d\n", ret);