diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-23 13:53:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-23 14:56:10 -0400 |
| commit | 5f757cdcc6efbefec09b8f964a234f84ff9fa7f6 (patch) | |
| tree | e8058651bd0319757d33fb7a949b9491211de7c7 /drivers/core/root.c | |
| parent | bba97cd2c96ae0c21ad916a9c4eb363fe569a2f9 (diff) | |
| parent | f3d46bd658ef4df575ec26c29e472ac858723159 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/core/root.c')
| -rw-r--r-- | drivers/core/root.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index 9b5c6bb10cb..12d046051fd 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -197,13 +197,15 @@ int dm_init_and_scan(bool pre_reloc_only) debug("dm_scan_platdata() failed: %d\n", ret); return ret; } -#ifdef CONFIG_OF_CONTROL - ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only); - if (ret) { - debug("dm_scan_fdt() failed: %d\n", ret); - return ret; + + if (OF_CONTROL) { + ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only); + if (ret) { + debug("dm_scan_fdt() failed: %d\n", ret); + return ret; + } } -#endif + ret = dm_scan_other(pre_reloc_only); if (ret) return ret; |