diff options
| author | Gabe Black <gabeblack@chromium.org> | 2012-10-20 12:33:11 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2012-11-30 13:44:05 -0800 |
| commit | 452b80ef8c09c97776dbb5254e0d358d2d91ebc8 (patch) | |
| tree | 0056973082d34415a71fb9dbc4e52470446ce1c6 /arch | |
| parent | f30fc4de4160300b90859958a4785c065483e69f (diff) | |
| download | talos-obmc-uboot-452b80ef8c09c97776dbb5254e0d358d2d91ebc8.tar.gz talos-obmc-uboot-452b80ef8c09c97776dbb5254e0d358d2d91ebc8.zip | |
x86: Add a dummy implementation for timer_get_us
The microsecond timer is not currently implemented, but add a dummy
implementation for now.
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/timer.c | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index be27dd9e2b..57324b6174 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -30,7 +30,7 @@ LIB = $(obj)lib$(CPU).o START-y = start.o RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += resetvec.o start16.o -COBJS = interrupts.o cpu.o +COBJS = interrupts.o cpu.o timer.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 new file mode 100644 index 0000000000..149109d4f4 --- /dev/null +++ b/arch/x86/cpu/timer.c @@ -0,0 +1,17 @@ +/* + * 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> + +unsigned long timer_get_us(void) +{ + printf("timer_get_us used but not implemented.\n"); + return 0; +} |
