diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-13 10:02:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-13 10:02:43 -0500 |
| commit | b67dfc5a1099eef2a323de23a78ba4e6d9b87633 (patch) | |
| tree | e23ed37c2736481bd5cbf58f4d8aab57381005e9 /common | |
| parent | 439fcb9b4f717f5a583014acb3e75b789564867c (diff) | |
| parent | 6d41027fe2e734aa1e15fabc1523417b3b871691 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
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) |