From: Bin Meng <bmeng.cn@gmail.com>
Date: Fri, 23 Oct 2015 02:13:33 +0000 (-0700)
Subject: x86: Move timer_init() call a bit earlier
X-Git-Tag: v2016.01-rc1~4^2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=643b0f75e71098f6deddddc9a17c4cbc1dc96957;p=u-boot

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>
---

diff --git a/common/board_f.c b/common/board_f.c
index ed513058ee..04c273e2fe 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -796,7 +796,7 @@ static init_fnc_t init_sequence_f[] = {
 	/* 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
diff --git a/common/board_r.c b/common/board_r.c
index c4fd3eaf8c..2270e2ed0f 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -837,8 +837,7 @@ init_fnc_t init_sequence_r[] = {
 #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)