armv7/arm64: remove timestamp.c

The src/lib/timestamp.c already has an implementation using
timer_monotonic_get() for timestamp_get(). Use that instead
of duplicating the logic.

BUG=chrome-os-partner:44669
BRANCH=None
TEST=None

Change-Id: If17be86143f217445bd64d67ceee4355fa482d39
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11468
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

4 files changed, 0 insertions, 67 deletions

diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc
index a46ef87e8e..089ef795d5 100644
--- a/src/arch/arm/armv7/Makefile.inc
+++ b/src/arch/arm/armv7/Makefile.inc
@@ -59,8 +59,6 @@ bootblock-y += cache_m.c
 
 endif # CONFIG_ARCH_BOOTBLOCK_ARMV7
 
-bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
-
 ################################################################################
 ## verification stage
 ################################################################################
@@ -85,8 +83,6 @@ verstage-S-ccopts += $(armv7-m_asm_flags)
 
 endif # CONFIG_ARCH_VERSTAGE_ARMV7_M
 
-verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
-
 ################################################################################
 ## ROM stage
 ################################################################################
@@ -96,7 +92,6 @@ romstage-y += cpu.S
 romstage-y += exception.c
 romstage-y += exception_asm.S
 romstage-y += mmu.c
-romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 
 romstage-c-ccopts += $(armv7-a_flags)
 romstage-S-ccopts += $(armv7-a_asm_flags)
@@ -117,7 +112,6 @@ ramstage-y += cpu.S
 ramstage-y += exception.c
 ramstage-y += exception_asm.S
 ramstage-y += mmu.c
-ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 
 ramstage-c-ccopts += $(armv7-a_flags)
 ramstage-S-ccopts += $(armv7-a_asm_flags)
diff --git a/src/arch/arm/armv7/timestamp.c b/src/arch/arm/armv7/timestamp.c
deleted file mode 100644
index 1b3138f9a8..0000000000
--- a/src/arch/arm/armv7/timestamp.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2013 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.
- */
-
-#include <timestamp.h>
-#include <timer.h>
-
-uint64_t timestamp_get(void)
-{
-	struct mono_time timestamp;
-	timer_monotonic_get(&timestamp);
-	return (uint64_t)timestamp.microseconds;
-}
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 3e14f8b0d5..a625c7a27f 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -64,7 +64,6 @@ bootblock-y += cpu-stubs.c
 bootblock-y += stages.c
 bootblock-y += eabi_compat.c
 bootblock-y += transition.c transition_asm.S
-bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 
 bootblock-y += memset.S
 bootblock-y += memcpy.S
@@ -95,7 +94,6 @@ verstage-y += ../../lib/memset.c
 verstage-y += ../../lib/memcpy.c
 verstage-y += ../../lib/memmove.c
 verstage-y += stages.c
-verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 
 endif # CONFIG_ARCH_VERSTAGE_ARM64
 
@@ -115,7 +113,6 @@ romstage-y += eabi_compat.c
 romstage-y += memset.S
 romstage-y += memcpy.S
 romstage-y += memmove.S
-romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 romstage-y += transition.c transition_asm.S
 
 rmodules_arm64-y += memset.S
@@ -169,8 +166,6 @@ secmon-y += memset.S
 secmon-y += memmove.S
 secmon-y += memcpy.S
 
-ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
-
 ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard.c)
 
 # Build the ramstage
diff --git a/src/arch/arm64/timestamp.c b/src/arch/arm64/timestamp.c
deleted file mode 100644
index 2962c7fe9b..0000000000
--- a/src/arch/arm64/timestamp.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 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.
- */
-
-#include <timestamp.h>
-#include <timer.h>
-
-uint64_t timestamp_get(void)
-{
-	struct mono_time timestamp;
-	timer_monotonic_get(&timestamp);
-	return (uint64_t)timestamp.microseconds;
-}