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 /drivers/core/root.c | |
| parent | 36b898b6bea839de7141b65df6ec02a97615c467 (diff) | |
| parent | 1269625177f120d659f66b18de4b532b16c44561 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/core/root.c')
| -rw-r--r-- | drivers/core/root.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index 95886add238..158702406ed 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -188,7 +188,7 @@ int dm_scan_platdata(bool pre_reloc_only) return ret; } -#if CONFIG_IS_ENABLED(OF_CONTROL) +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset, bool pre_reloc_only) { @@ -244,7 +244,7 @@ int dm_init_and_scan(bool pre_reloc_only) return ret; } - if (CONFIG_IS_ENABLED(OF_CONTROL)) { + if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) { ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only); if (ret) { debug("dm_scan_fdt() failed: %d\n", ret); |