diff mbox

[U-Boot,16/31] dm: spl: Don't set up device tree with of-platdata

Message ID 1465354089-3508-17-git-send-email-sjg@chromium.org
State Accepted
Commit d223e0a82255b5fa6049f92556236f8ffd6b745c
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass June 8, 2016, 2:47 a.m. UTC 
When this feature is enabled, we should not access the device tree.

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

 common/spl/spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/common/spl/spl.c b/common/spl/spl.c
index e931edd..45a988d 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -197,7 +197,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);