[PATCH] uthreads: Make use of CONFIG_IS_ENABLED consistently

[Tom Rini]

We do not yet support UTHREADS in xPL phases. However, we have the need
to dummy out certain functions so that xPL can build when full U-Boot
has UTHREADS enabled. Update the few places that need to use
CONFIG_IS_ENABLED so that we have the correct dummy in xPL.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
Cc: Jerome Forissier <jerome.forissier at linaro.org>
---
 include/uthread.h | 4 ++--
 lib/Makefile      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/uthread.h b/include/uthread.h
index 11a19aa94882..78dab77f196f 100644
--- a/include/uthread.h
+++ b/include/uthread.h
@@ -72,7 +72,7 @@ struct uthread_mutex {
 
 #define UTHREAD_MUTEX_INITIALIZER { .state = UTHREAD_MUTEX_UNLOCKED }
 
-#ifdef CONFIG_UTHREAD
+#if CONFIG_IS_ENABLED(UTHREAD)
 
 /**
  * uthread_create() - Create a uthread object and make it ready for execution
@@ -184,5 +184,5 @@ static inline bool uthread_grp_done(unsigned int grp_id)
 #define uthread_mutex_trylock(_mutex) ({ 0 })
 #define uthread_mutex_unlock(_mutex) ({ 0; })
 
-#endif /* CONFIG_UTHREAD */
+#endif /* CONFIG_IS_ENABLED(UTHREAD) */
 #endif /* _UTHREAD_H_ */
diff --git a/lib/Makefile b/lib/Makefile
index 2643bfc867cb..7a44babffaa7 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -159,7 +159,7 @@ obj-$(CONFIG_LIB_ELF) += elf.o
 
 obj-$(CONFIG_$(PHASE_)SEMIHOSTING) += semihosting.o
 
-obj-$(CONFIG_UTHREAD) += uthread.o
+obj-$(CONFIG_$(PHASE_)UTHREAD) += uthread.o
 
 #
 # Build a fast OID lookup registry from include/linux/oid_registry.h
-- 
2.43.0