diff options
| author | Simon Glass <sjg@chromium.org> | 2016-07-04 11:57:58 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-07-14 20:40:24 -0600 |
| commit | 29629eb897f8d8119b06477d0ca3c4b424726e51 (patch) | |
| tree | 4254d41ba3eb1705f5fcea51a4ef1950093030e3 /drivers/core/root.c | |
| parent | 054b3a1e80fcbca02cb0d0728629af02f18517f5 (diff) | |
| download | u-boot-imx-29629eb897f8d8119b06477d0ca3c4b424726e51.zip u-boot-imx-29629eb897f8d8119b06477d0ca3c4b424726e51.tar.gz u-boot-imx-29629eb897f8d8119b06477d0ca3c4b424726e51.tar.bz2 | |
dm: core: Don't use device tree with of-platdata
When CONFIG_SPL_OF_PLATDATA is enabled we should not access the device
tree. Remove all references to this in the core driver-model code.
Signed-off-by: Simon Glass <sjg@chromium.org>
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 95886ad..1587024 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); |