Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / board / sandbox / sandbox.c

diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 2227f1c1214a97ae078fe18dac950dfe1a835b90..195f620834bf81fbd694a1c2efdfa2340eb865b7 100644 (file)
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -1,12 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <cros_ec.h>
 #include <dm.h>
 #include <os.h>
+#include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
 
 /*
@@ -25,33 +26,26 @@ void flush_cache(unsigned long start, unsigned long size)
 {
 }
 
-unsigned long timer_read_counter(void)
-{
-       return os_get_nsec() / 1000;
-}
+#ifndef CONFIG_TIMER
+/* system timer offset in ms */
+static unsigned long sandbox_timer_offset;
 
-int dram_init(void)
+void sandbox_timer_add_offset(unsigned long offset)
 {
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
-       return 0;
+       sandbox_timer_offset += offset;
 }
 
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
+unsigned long timer_read_counter(void)
 {
-#ifdef CONFIG_VIDEO_SANDBOX_SDL
-       int ret;
-
-       ret = sandbox_lcd_sdl_early_init();
-       if (ret) {
-               puts("Could not init sandbox LCD emulation\n");
-               return ret;
-       }
+       return os_get_nsec() / 1000 + sandbox_timer_offset * 1000;
+}
 #endif
 
+int dram_init(void)
+{
+       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
        return 0;
 }
-#endif
 
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)