diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-10-22 19:13:33 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2015-11-13 06:46:20 -0800 |
| commit | 643b0f75e71098f6deddddc9a17c4cbc1dc96957 (patch) | |
| tree | 3a26a8a081971a7b8327c2e658f5bb9997fb0fc3 /common | |
| parent | e5ffa4bb62b4532079ea552a804178f3955775f9 (diff) | |
| download | blackbird-obmc-uboot-643b0f75e71098f6deddddc9a17c4cbc1dc96957.tar.gz blackbird-obmc-uboot-643b0f75e71098f6deddddc9a17c4cbc1dc96957.zip | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 2 | ||||
| -rw-r--r-- | common/board_r.c | 3 |
2 files changed, 2 insertions, 3 deletions
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) |
