tpm: add kconfig control in tcg2_create_digest()

[J-u-boot.git] / lib / time.c

diff --git a/lib/time.c b/lib/time.c
index 5252190af53f3c01acf01fcba597022c629ac1ca..d88edafb1962d70653dff76e18b4c52f8aba07f1 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <bootstage.h>
 #include <dm.h>
@@ -70,15 +69,14 @@ extern unsigned long timer_read_counter(void);
 ulong notrace get_tbclk(void)
 {
        if (!gd->timer) {
-#ifdef CONFIG_TIMER_EARLY
-               return timer_early_get_rate();
-#else
                int ret;
 
+               if (IS_ENABLED(CONFIG_TIMER_EARLY))
+                       return timer_early_get_rate();
+
                ret = dm_timer_init();
                if (ret)
                        return ret;
-#endif
        }
 
        return timer_get_rate(gd->timer);
@@ -90,20 +88,19 @@ uint64_t notrace get_ticks(void)
        int ret;
 
        if (!gd->timer) {
-#ifdef CONFIG_TIMER_EARLY
-               return timer_early_get_count();
-#else
                int ret;
 
+               if (IS_ENABLED(CONFIG_TIMER_EARLY))
+                       return timer_early_get_count();
+
                ret = dm_timer_init();
                if (ret)
                        panic("Could not initialize timer (err %d)\n", ret);
-#endif
        }
 
        ret = timer_get_count(gd->timer, &count);
        if (ret) {
-               if (spl_phase() > PHASE_TPL)
+               if (xpl_phase() > PHASE_TPL)
                        panic("Could not read count from timer (err %d)\n",
                              ret);
                else