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 f3aaf472d10384e8b03ca8d60a217498f28b5e76..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>
@@ -19,27 +18,27 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 
-#ifndef CONFIG_WD_PERIOD
-# define CONFIG_WD_PERIOD      (10 * 1000 * 1000)      /* 10 seconds default */
+#ifndef CFG_WD_PERIOD
+# define CFG_WD_PERIOD (10 * 1000 * 1000)      /* 10 seconds default */
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_SYS_TIMER_RATE
+#ifdef CFG_SYS_TIMER_RATE
 /* Returns tick rate in ticks per second */
 ulong notrace get_tbclk(void)
 {
-       return CONFIG_SYS_TIMER_RATE;
+       return CFG_SYS_TIMER_RATE;
 }
 #endif
 
-#ifdef CONFIG_SYS_TIMER_COUNTER
+#ifdef CFG_SYS_TIMER_COUNTER
 unsigned long notrace timer_read_counter(void)
 {
 #ifdef CONFIG_SYS_TIMER_COUNTS_DOWN
-       return ~readl(CONFIG_SYS_TIMER_COUNTER);
+       return ~readl(CFG_SYS_TIMER_COUNTER);
 #else
-       return readl(CONFIG_SYS_TIMER_COUNTER);
+       return readl(CFG_SYS_TIMER_COUNTER);
 #endif
 }
 
@@ -47,8 +46,8 @@ ulong timer_get_boot_us(void)
 {
        ulong count = timer_read_counter();
 
-#ifdef CONFIG_SYS_TIMER_RATE
-       const ulong timer_rate = CONFIG_SYS_TIMER_RATE;
+#ifdef CFG_SYS_TIMER_RATE
+       const ulong timer_rate = CFG_SYS_TIMER_RATE;
 
        if (timer_rate == 1000000)
                return count;
@@ -63,22 +62,21 @@ ulong timer_get_boot_us(void)
 }
 
 #else
-extern unsigned long __weak timer_read_counter(void);
+extern unsigned long timer_read_counter(void);
 #endif
 
 #if CONFIG_IS_ENABLED(TIMER)
 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
@@ -199,7 +196,7 @@ void udelay(unsigned long usec)
 
        do {
                schedule();
-               kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec;
+               kv = usec > CFG_WD_PERIOD ? CFG_WD_PERIOD : usec;
                __udelay(kv);
                usec -= kv;
        } while(usec);