5 files changed, 32 insertions, 2 deletions
diff --git a/src/mainboard/emulation/qemu-riscv/Makefile.inc b/src/mainboard/emulation/qemu-riscv/Makefile.inc
index 36f1fca58c..1d882acc63 100644
--- a/src/mainboard/emulation/qemu-riscv/Makefile.inc
+++ b/src/mainboard/emulation/qemu-riscv/Makefile.inc
@@ -14,11 +14,15 @@
 
 bootblock-y += uart.c
 bootblock-y += rom_media.c
+bootblock-y += mtime.c
+
 romstage-y += romstage.c
 romstage-y += uart.c
 romstage-y += rom_media.c
+
 ramstage-y += uart.c
 ramstage-y += rom_media.c
+ramstage-y += mtime.c
 
 bootblock-y += memlayout.ld
 romstage-y += memlayout.ld
diff --git a/src/soc/ucb/riscv/mtime.c b/src/mainboard/emulation/qemu-riscv/mtime.c
index f8c2717563..f8c2717563 100644
--- a/src/soc/ucb/riscv/mtime.c
+++ b/src/mainboard/emulation/qemu-riscv/mtime.c
diff --git a/src/mainboard/emulation/spike-riscv/Makefile.inc b/src/mainboard/emulation/spike-riscv/Makefile.inc
index 36f1fca58c..38977b6345 100644
--- a/src/mainboard/emulation/spike-riscv/Makefile.inc
+++ b/src/mainboard/emulation/spike-riscv/Makefile.inc
@@ -14,11 +14,13 @@
 
 bootblock-y += uart.c
 bootblock-y += rom_media.c
+bootblock-y += clint.c
 romstage-y += romstage.c
 romstage-y += uart.c
 romstage-y += rom_media.c
 ramstage-y += uart.c
 ramstage-y += rom_media.c
+ramstage-y += clint.c
 
 bootblock-y += memlayout.ld
 romstage-y += memlayout.ld
diff --git a/src/mainboard/emulation/spike-riscv/clint.c b/src/mainboard/emulation/spike-riscv/clint.c
new file mode 100644
index 0000000000..7ad3f5a7af
--- /dev/null
+++ b/src/mainboard/emulation/spike-riscv/clint.c
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 HardenedLinux
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <mcall.h>
+
+#define SPIKE_CLINT_BASE	0x02000000
+
+/* This function is used to initialize HLS()->time/HLS()->timecmp  */
+void mtime_init(void)
+{
+	long hart_id = read_csr(mhartid);
+	HLS()->time = (uint64_t *)(SPIKE_CLINT_BASE + 0xbff8);
+	HLS()->timecmp = (uint64_t *)(SPIKE_CLINT_BASE + 0x4000 + 8 * hart_id);
+}
diff --git a/src/soc/ucb/riscv/Makefile.inc b/src/soc/ucb/riscv/Makefile.inc
index c96e3637b7..ef03642d89 100644
--- a/src/soc/ucb/riscv/Makefile.inc
+++ b/src/soc/ucb/riscv/Makefile.inc
@@ -1,13 +1,11 @@
 ifeq ($(CONFIG_SOC_UCB_RISCV),y)
 
-bootblock-y += mtime.c
 bootblock-y += ipi.c
 
 romstage-y += cbmem.c
 romstage-y += ipi.c
 
 ramstage-y += cbmem.c
-ramstage-y += mtime.c
 ramstage-y += ipi.c
 
 endif