commit e8e589d50157769b0825128bb058e198d2a9c818
author Bin Meng <bmeng.cn@gmail.com> Thu Oct 22 19:13:33 2015 -0700
committer Bin Meng <bmeng.cn@gmail.com> Fri Nov 13 06:46:20 2015 -0800
tree 3a26a8a081971a7b8327c2e658f5bb9997fb0fc3
parent 239a40aed81226d21452cd6eaaa8a00271a7008d

x86: Move timer_init() call a bit earlier

Currently timer_init() is called in board_r.c which is quite late.
Some vgabios execution requires we set up the i8254 timer correctly,
but video initialization comes before timer_init(). Move the call
to board_f.c.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

common/board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index ed51305..04c273e 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -796,7 +796,7 @@
 	/* TODO: can we rename this to timer_init()? */
 	init_timebase,
 #endif
-#if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \
+#if defined(CONFIG_X86) || defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \
 		defined(CONFIG_BLACKFIN) || defined(CONFIG_NDS32)
 	timer_init,		/* initialize timer */
 #endif

common/board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index c4fd3ea..2270e2e 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -837,8 +837,7 @@
 #if defined(CONFIG_ARM) || defined(CONFIG_AVR32)
 	initr_enable_interrupts,
 #endif
-#if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) \
-	|| defined(CONFIG_M68K)
+#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) || defined(CONFIG_M68K)
 	timer_init,		/* initialize timer */
 #endif
 #if defined(CONFIG_STATUS_LED)