diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-07 13:49:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-07 13:49:39 -0400 |
| commit | 2f760735c170c854ffca76be5607cec5c56fdc4f (patch) | |
| tree | 50cfd63bf25f0106c0ffa622cd4c9285dc36fc31 /drivers/core/root.c | |
| parent | ba83753289f5ad99f64e72fd0ee141c647aeda0f (diff) | |
| parent | eaae4ee2bd349797a69f74240abd8329e18d5dbd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
- Initial DM conversion
Diffstat (limited to 'drivers/core/root.c')
| -rw-r--r-- | drivers/core/root.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index aa5ca4087a..e85643819e 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -314,13 +314,6 @@ int dm_scan_fdt(const void *blob, bool pre_reloc_only) #endif return dm_scan_fdt_node(gd->dm_root, blob, 0, pre_reloc_only); } -#else -static int dm_scan_fdt_node(struct udevice *parent, const void *blob, - int offset, bool pre_reloc_only) -{ - return 0; -} -#endif static int dm_scan_fdt_ofnode_path(const char *path, bool pre_reloc_only) { @@ -360,6 +353,7 @@ int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only) return ret; } +#endif __weak int dm_scan_other(bool pre_reloc_only) { |