dm: spl: Don't set up device tree with of-platdata
authorSimon Glass <sjg@chromium.org>
Mon, 4 Jul 2016 17:57:56 +0000 (11:57 -0600)
committerSimon Glass <sjg@chromium.org>
Fri, 15 Jul 2016 02:40:24 +0000 (20:40 -0600)
When this feature is enabled, we should not access the device tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
common/spl/spl.c

index 5fbf101fb1c0011f913e387e2daf368e77366593..59f41a12237a6df6ca48e68aae29c16cef3595f3 100644 (file)
@@ -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);