diff options
| author | Tom Rini <trini@ti.com> | 2012-11-28 13:44:40 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-28 13:44:40 -0700 |
| commit | e57d9d15eeab923f6c0de05d7caad317d861bbc5 (patch) | |
| tree | 4c48c08c983e1b50850cdc7206ed4fb796087bed /arch/x86/lib/board.c | |
| parent | a86fcff69519841aa1338efb1ace37ca77c16c35 (diff) | |
| parent | d02a568e9aa3c3500d9b680f60782c192fd51691 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-x86
Diffstat (limited to 'arch/x86/lib/board.c')
| -rw-r--r-- | arch/x86/lib/board.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index e5caf13561..c7d89604ca 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -36,6 +36,7 @@ #include <stdio_dev.h> #include <asm/u-boot-x86.h> #include <asm/relocate.h> +#include <asm/processor.h> #include <asm/init_helpers.h> #include <asm/init_wrappers.h> @@ -121,7 +122,6 @@ init_fnc_t *init_sequence_f[] = { * initialise the CPU caches (to speed up the relocation process) */ init_fnc_t *init_sequence_f_r[] = { - copy_gd_to_ram_f_r, init_cache_f_r, copy_uboot_to_ram, clear_bss, @@ -164,9 +164,6 @@ init_fnc_t *init_sequence_r[] = { #ifdef CONFIG_MISC_INIT_R misc_init_r, #endif -#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE) - pci_init_r, -#endif #if defined(CONFIG_CMD_KGDB) kgdb_init_r, #endif |