diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-15 08:06:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-15 08:06:22 -0400 |
| commit | ebe621d5fb2f5c15aff50e0610372f2751fd152f (patch) | |
| tree | 12985b43f1a8500332de8e20274cc2dd26f5a040 /common/spl | |
| parent | 36b898b6bea839de7141b65df6ec02a97615c467 (diff) | |
| parent | 1269625177f120d659f66b18de4b532b16c44561 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 840910a684..12aed02935 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -13,7 +13,6 @@ #include <nand.h> #include <fat.h> #include <version.h> -#include <i2c.h> #include <image.h> #include <malloc.h> #include <dm/root.h> @@ -203,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); @@ -211,7 +210,8 @@ int spl_init(void) } } if (IS_ENABLED(CONFIG_SPL_DM)) { - ret = dm_init_and_scan(true); + /* With CONFIG_OF_PLATDATA, bring in all devices */ + ret = dm_init_and_scan(!CONFIG_IS_ENABLED(OF_PLATDATA)); if (ret) { debug("dm_init_and_scan() returned error %d\n", ret); return ret; |