From: Simon Glass <sjg@chromium.org>
Date: Mon, 4 Jul 2016 17:57:56 +0000 (-0600)
Subject: dm: spl: Don't set up device tree with of-platdata
X-Git-Tag: v2016.09-rc1~82^2~46
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d223e0a82255b5fa6049f92556236f8ffd6b745c;p=oweals%2Fu-boot.git

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>
---

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 5fbf101fb1..59f41a1223 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -202,7 +202,7 @@ int spl_init(void)
 	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);