diff options
| author | Tom Rini <trini@ti.com> | 2014-12-01 15:24:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-01 15:24:07 -0500 |
| commit | f4e7e2d12164c3235c3f5e19a68a503623029d35 (patch) | |
| tree | dea8bdf2bf2a50f561c165b5bbd4e1195ab01994 /common | |
| parent | 9e374e7b729dc9f68be89cd3e3b1d4d48c768ecf (diff) | |
| parent | 908ec6e4d1d12f746cb9b7cc73430a268ceb2c92 (diff) | |
| download | u-boot-imx-f4e7e2d12164c3235c3f5e19a68a503623029d35.zip u-boot-imx-f4e7e2d12164c3235c3f5e19a68a503623029d35.tar.gz u-boot-imx-f4e7e2d12164c3235c3f5e19a68a503623029d35.tar.bz2 | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/common/board_r.c b/common/board_r.c index 19c6427..1b8998d 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -775,7 +775,7 @@ init_fnc_t init_sequence_r[] = { initr_flash, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_PPC) || defined(CONFIG_X86) +#if defined(CONFIG_PPC) /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, #endif @@ -838,11 +838,8 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CMD_KGDB initr_kgdb, #endif -#ifdef CONFIG_X86 - board_early_init_r, -#endif interrupt_init, -#if defined(CONFIG_ARM) || defined(CONFIG_x86) +#if defined(CONFIG_ARM) initr_enable_interrupts, #endif #ifdef CONFIG_X86 |