diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-08-31 18:03:28 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2019-09-02 17:38:42 +0200 |
| commit | d7677bfc04920aa5e6a7c886a5095bcd53e0503a (patch) | |
| tree | 1b7d1fda5a0139123e22caa723bca2cc4e9affe7 /drivers/core/root.c | |
| parent | d22c8be964a870f59d2fdab6c67cefa0c4799364 (diff) | |
dm: core: Decouple DM from DT
Some of the DM functions depend on OF_CONTROL, which is incorrect.
DM and DT are orthogonal. Add macro guards around such functions to
avoid compiling them in when DM is enabled, while OF_CONTROL is not.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
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) { |