diff options
| author | Simon Glass | 2016-07-04 11:57:56 -0600 |
|---|---|---|
| committer | Simon Glass | 2016-07-14 20:40:24 -0600 |
| commit | d223e0a82255b5fa6049f92556236f8ffd6b745c (patch) | |
| tree | f74caa1f55d3f3af323c7b7bfab866edfa27bd9a /common/spl | |
| parent | a091a8f084f731953fa77a3da3b5bec72d37ad0f (diff) | |
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>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 5fbf101fb1c..59f41a12237 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); |