From d7677bfc04920aa5e6a7c886a5095bcd53e0503a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 31 Aug 2019 18:03:28 +0200 Subject: 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 Cc: Simon Glass --- drivers/core/util.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/core/util.c') diff --git a/drivers/core/util.c b/drivers/core/util.c index 60b939a924..7dc1a2af02 100644 --- a/drivers/core/util.c +++ b/drivers/core/util.c @@ -31,6 +31,7 @@ int list_count_items(struct list_head *head) return count; } +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) bool dm_ofnode_pre_reloc(ofnode node) { #if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD) @@ -56,3 +57,4 @@ bool dm_ofnode_pre_reloc(ofnode node) return false; #endif } +#endif -- cgit v1.2.3