From 2bc709d4b99447f8decdc7580fdabab6dd8939b1 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Mon, 12 Nov 2018 06:55:53 -0600
Subject: [PATCH] sched/clock/clock_initialize.c:  clock_inittime() needs to be
 done with CONFIG_SCHED_TICKLESS and clock_initialize should skip
 clock_inittime() for external RTC case since the RTC isn't ready yet.

---
 sched/clock/clock_initialize.c | 36 ++++++++++++++--------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/sched/clock/clock_initialize.c b/sched/clock/clock_initialize.c
index 71d0d18f95a..dd4c2b4f722 100644
--- a/sched/clock/clock_initialize.c
+++ b/sched/clock/clock_initialize.c
@@ -65,9 +65,9 @@
 
 #ifndef CONFIG_SCHED_TICKLESS
 #ifdef CONFIG_SYSTEM_TIME64
-volatile uint64_t g_system_timer;
+volatile uint64_t g_system_timer = INITIAL_SYSTEM_TIMER_TICKS;
 #else
-volatile uint32_t g_system_timer;
+volatile uint32_t g_system_timer = INITIAL_SYSTEM_TIMER_TICKS;
 #endif
 #endif
 
@@ -170,37 +170,31 @@ static inline int clock_basetime(FAR struct timespec *tp)
  *
  ****************************************************************************/
 
+#ifdef CONFIG_RTC
 static void clock_inittime(void)
 {
   /* (Re-)initialize the time value to match the RTC */
 
 #ifndef CONFIG_CLOCK_TIMEKEEPING
-#ifndef CONFIG_RTC_HIRES
-  clock_basetime(&g_basetime);
-#endif
-#ifndef CONFIG_SCHED_TICKLESS
-  g_system_timer = INITIAL_SYSTEM_TIMER_TICKS;
-  if (g_system_timer > 0)
-    {
-      struct timespec ts;
+  struct timespec ts;
 
-      (void)clock_ticks2time((sclock_t)g_system_timer, &ts);
+  clock_basetime(&g_basetime);
+  clock_systimespec(&ts);
 
-      /* Adjust base time to hide initial timer ticks. */
+  /* Adjust base time to hide initial timer ticks. */
 
-      g_basetime.tv_sec  -= ts.tv_sec;
-      g_basetime.tv_nsec -= ts.tv_nsec;
-      while (g_basetime.tv_nsec < 0)
-        {
-          g_basetime.tv_nsec += NSEC_PER_SEC;
-          g_basetime.tv_sec--;
-        }
+  g_basetime.tv_sec  -= ts.tv_sec;
+  g_basetime.tv_nsec -= ts.tv_nsec;
+  while (g_basetime.tv_nsec < 0)
+    {
+      g_basetime.tv_nsec += NSEC_PER_SEC;
+      g_basetime.tv_sec--;
     }
-#endif /* !CONFIG_SCHED_TICKLESS */
 #else
   clock_inittimekeeping();
 #endif
 }
+#endif
 
 /****************************************************************************
  * Public Functions
@@ -222,11 +216,11 @@ void clock_initialize(void)
    */
 
   up_rtc_initialize();
-#endif
 
   /* Initialize the time value to match the RTC */
 
   clock_inittime();
+#endif
 }
 
 /****************************************************************************