commit bb948386e362e02309a16eb1c713b032442bc8bd
author Simon Glass <sjg@chromium.org> Mon Jul 04 11:57:56 2016 -0600
committer Simon Glass <sjg@chromium.org> Thu Jul 14 20:40:24 2016 -0600
tree f74caa1f55d3f3af323c7b7bfab866edfa27bd9a
parent 4e9c1311bd4577059db956f5ec9cf70a291cef5b

dm: spl: Don't set up device tree with of-platdata

When this feature is enabled, we should not access the device tree.

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

common/spl/spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 5fbf101..59f41a1 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -202,7 +202,7 @@
 	gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN;
 	gd->malloc_ptr = 0;
 #endif
-	if (CONFIG_IS_ENABLED(OF_CONTROL)) {
+	if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
 		ret = fdtdec_setup();
 		if (ret) {
 			debug("fdtdec_setup() returned error %d\n", ret);