2 files changed, 29 insertions, 2 deletions
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index c7bf8a915..d7684d38e 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -34,12 +34,12 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {
-	/* Ignore this for now */
+	os_usleep(usec);
 }
 
 unsigned long timer_get_us(void)
 {
-	return 0;
+	return os_get_nsec() / 1000;
 }
 
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index b7c3bf5f8..6d55b5cbc 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -23,9 +23,12 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
+#include <time.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <linux/types.h>
 
 #include <os.h>
 
@@ -94,3 +97,27 @@ void *os_malloc(size_t length)
 	return mmap(NULL, length, PROT_READ | PROT_WRITE,
 			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 }
+
+void os_usleep(unsigned long usec)
+{
+	usleep(usec);
+}
+
+u64 os_get_nsec(void)
+{
+#if defined(CLOCK_MONOTONIC) && defined(_POSIX_MONOTONIC_CLOCK)
+	struct timespec tp;
+	if (EINVAL == clock_gettime(CLOCK_MONOTONIC, &tp)) {
+		struct timeval tv;
+
+		gettimeofday(&tv, NULL);
+		tp.tv_sec = tv.tv_sec;
+		tp.tv_nsec = tv.tv_usec * 1000;
+	}
+	return tp.tv_sec * 1000000000ULL + tp.tv_nsec;
+#else
+	struct timeval tv;
+	gettimeofday(&tv, NULL);
+	return tv.tv_sec * 1000000000ULL + tv.tv_usec * 1000;
+#endif
+}