3 files changed, 19 insertions, 44 deletions
diff --git a/src/soc/samsung/exynos5420/Makefile.inc b/src/soc/samsung/exynos5420/Makefile.inc
index 4e92864d5e..7eb407e957 100644
--- a/src/soc/samsung/exynos5420/Makefile.inc
+++ b/src/soc/samsung/exynos5420/Makefile.inc
@@ -1,10 +1,9 @@
 bootblock-y += spi.c alternate_cbfs.c
 bootblock-y += bootblock.c
-bootblock-y += pinmux.c mct.c power.c
+bootblock-y += pinmux.c timer.c power.c
 # Clock is required for UART
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += clock_init.c
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += clock.c
-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += monotonic_timer.c
 ifeq ($(CONFIG_DRIVERS_UART),y)
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c
 endif
@@ -19,8 +18,7 @@ romstage-y += pinmux.c  # required by s3c24x0_i2c and uart.
 romstage-y += dmc_common.c
 romstage-y += dmc_init_ddr3.c
 romstage-y += power.c
-romstage-y += mct.c
-romstage-y += monotonic_timer.c
+romstage-y += timer.c
 romstage-$(CONFIG_DRIVERS_UART) += uart.c
 romstage-y += wakeup.c
 romstage-y += gpio.c
@@ -37,16 +35,14 @@ ramstage-y += power.c
 ramstage-$(CONFIG_DRIVERS_UART) += uart.c
 ramstage-y += cpu.c
 ramstage-y += tmu.c
-ramstage-y += mct.c
-ramstage-y += monotonic_timer.c
+ramstage-y += timer.c
 ramstage-y += gpio.c
 ramstage-y += i2c.c
 ramstage-y += dp.c dp_lowlevel.c fimd.c
 ramstage-y += usb.c
 ramstage-y += cbmem.c
 
-rmodules_$(ARCH-romstage-y)-y += monotonic_timer.c
-rmodules_$(ARCH-romstage-y)-y += mct.c
+rmodules_$(ARCH-ROMSTAGE-y)-y += timer.c
 
 CPPFLAGS_common += -Isrc/soc/samsung/exynos5420/include/
 
diff --git a/src/soc/samsung/exynos5420/mct.c b/src/soc/samsung/exynos5420/mct.c
deleted file mode 100644
index ae6186ab8c..0000000000
--- a/src/soc/samsung/exynos5420/mct.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2012 Google Inc.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <arch/io.h>
-#include <soc/clk.h>
-#include <stdint.h>
-
-uint64_t mct_raw_value(void)
-{
-	uint64_t upper = readl(&exynos_mct->g_cnt_u);
-	uint64_t lower = readl(&exynos_mct->g_cnt_l);
-
-	return (upper << 32) | lower;
-}
-
-void mct_start(void)
-{
-	writel(readl(&exynos_mct->g_tcon) | (0x1 << 8),
-		&exynos_mct->g_tcon);
-}
diff --git a/src/soc/samsung/exynos5420/monotonic_timer.c b/src/soc/samsung/exynos5420/timer.c
index 9dafa23567..0947d19d63 100644
--- a/src/soc/samsung/exynos5420/monotonic_timer.c
+++ b/src/soc/samsung/exynos5420/timer.c
@@ -17,12 +17,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/io.h>
 #include <soc/clk.h>
 #include <stdint.h>
 #include <timer.h>
 
 static const uint32_t clocks_per_usec = MCT_HZ/1000000;
 
+uint64_t mct_raw_value(void)
+{
+	uint64_t upper = readl(&exynos_mct->g_cnt_u);
+	uint64_t lower = readl(&exynos_mct->g_cnt_l);
+
+	return (upper << 32) | lower;
+}
+
+void mct_start(void)
+{
+	writel(readl(&exynos_mct->g_tcon) | (0x1 << 8),
+		&exynos_mct->g_tcon);
+}
+
 void timer_monotonic_get(struct mono_time *mt)
 {
 	/* We don't have to call mct_start() here