summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2011-09-22 11:30:56 -0700
committerStefan Reinauer <reinauer@google.com>2011-09-22 16:10:34 -0700
commita5049abf85217d6da4bb725d59ddfe018beea6b3 (patch)
treef61190bc09424f7518ad2af498264ddf42d877b4 /arch
parent89c2de1af7acaaeedeb26a6c06399274fcf5939c (diff)
Make coreboot / chromeos config more similar to ARM configs.
Signed-off-by: Stefan Reinauer <reinauer@google.com> BUG=chrome-os-partner:6077 TEST=none Change-Id: I417ea3da24dc0cff17aa83ef799fabe78e4b1da5 Reviewed-on: http://gerrit.chromium.org/gerrit/8143 Tested-by: Stefan Reinauer <reinauer@google.com> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Commit-Ready: Stefan Reinauer <reinauer@google.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/cpu/timer.c8
-rw-r--r--arch/x86/include/asm/u-boot-x86.h1
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
index 149109d4f45..fa732d1a1bc 100644
--- a/arch/x86/cpu/timer.c
+++ b/arch/x86/cpu/timer.c
@@ -12,6 +12,12 @@
unsigned long timer_get_us(void)
{
- printf("timer_get_us used but not implemented.\n");
+ printf("%s() used but not implemented.\n", __func__);
+ return 0;
+}
+
+ulong get_timer_masked(void)
+{
+ printf("%s() used but not implemented.\n", __func__);
return 0;
}
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index 7c79da6905f..8847f85d561 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -39,6 +39,7 @@ int register_timer_isr (timer_fnc_t *isr_func);
/* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or $(BOARD)/ */
int timer_init(void);
int dram_init_f(void);
+ulong get_timer_masked(void);
/* cpu/.../interrupts.c */
int cpu_init_interrupts(void);