Skip to content
Snippets Groups Projects
Commit b2b0d3e7 authored by Simon Glass's avatar Simon Glass
Browse files

dm: core: Select device tree control correctly for SPL


Some boards will not use device tree for SPL even with driver model. Add
the logic to support this.

Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
parent 1d76bf22
No related branches found
No related tags found
No related merge requests found
......@@ -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
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;
......
......@@ -41,6 +41,16 @@ struct fdt_memory {
fdt_addr_t end;
};
#ifdef CONFIG_OF_CONTROL
# if defined(CONFIG_SPL_BUILD) && defined(SPL_DISABLE_OF_CONTROL)
# define OF_CONTROL 0
# else
# define OF_CONTROL 1
# endif
#else
# define OF_CONTROL 0
#endif
/*
* Information about a resource. start is the first address of the resource
* and end is the last address (inclusive). The length of the resource will
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment