LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bin Meng 2015-10-22 19:13:33 -07:00
parent e5ffa4bb62
commit 643b0f75e7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/board_f.c
View File

@ -796,7 +796,7 @@ static init_fnc_t init_sequence_f[] = {
/* TODO: can we rename this to timer_init()? */ /* TODO: can we rename this to timer_init()? */
init_timebase, init_timebase,
#endif #endif
#if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \ #if defined(CONFIG_X86) || defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \
defined(CONFIG_BLACKFIN) || defined(CONFIG_NDS32) defined(CONFIG_BLACKFIN) || defined(CONFIG_NDS32)
timer_init, /* initialize timer */ timer_init, /* initialize timer */
#endif #endif

3
common/board_r.c
View File

@ -837,8 +837,7 @@ init_fnc_t init_sequence_r[] = {
#if defined(CONFIG_ARM) || defined(CONFIG_AVR32) #if defined(CONFIG_ARM) || defined(CONFIG_AVR32)
initr_enable_interrupts, initr_enable_interrupts,
#endif #endif
#if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) \ #if defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) || defined(CONFIG_M68K)
|| defined(CONFIG_M68K)
timer_init, /* initialize timer */ timer_init, /* initialize timer */
#endif #endif
#if defined(CONFIG_STATUS_LED) #if defined(CONFIG_STATUS_LED)