summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-04-17 16:13:37 +0000
committerSimon Glass <sjg@chromium.org>2013-05-13 13:33:21 -0700
commit29756d44470f684e785a895e1f7d680e61764b58 (patch)
tree64cc3841c4fb6bcadb03f1cdb75a4e60527d8a60
parente761ecdbb83e3151ffea5b531523256c57e62527 (diff)
downloadu-boot-imx-29756d44470f684e785a895e1f7d680e61764b58.zip
u-boot-imx-29756d44470f684e785a895e1f7d680e61764b58.tar.gz
u-boot-imx-29756d44470f684e785a895e1f7d680e61764b58.tar.bz2
x86: Remove old broken timer implementation
Tidy up some old broken and unneeded implementations. These are not used by coreboot or anything else now. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Gabe Black <gabeblack@chromium.org> Reviewed-by: Michael Spang <spang@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Acked-by: Graeme Russ <graeme.russ@gmail.com>
-rw-r--r--arch/x86/cpu/Makefile2
-rw-r--r--arch/x86/cpu/timer.c20
2 files changed, 1 insertions, 21 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 7b520f8..cddf0dd 100644
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@ -30,7 +30,7 @@ LIB = $(obj)lib$(CPU).o
START-y = start.o
START-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
-COBJS = interrupts.o cpu.o timer.o
+COBJS = interrupts.o cpu.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
deleted file mode 100644
index f95fce5..0000000
--- a/arch/x86/cpu/timer.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#include <common.h>
-
-/* Temporary patch to maintain bisectability, removed in next commit */
-#ifndef CONFIG_SYS_X86_TSC_TIMER
-unsigned long timer_get_us(void)
-{
- printf("timer_get_us used but not implemented.\n");
- return 0;
-}
-#endif