diff options
| author | Simon Glass <sjg@chromium.org> | 2013-03-11 06:08:09 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2013-03-19 08:45:37 -0700 |
| commit | 192868b0614e68d165fffe9996c6c45db1c47fcb (patch) | |
| tree | 411fff81508125b4f39d6b7ff9bbcf3e56f46c16 /arch | |
| parent | bb8215f437a7c948eec82a6abe754c226978bd6d (diff) | |
x86: Move PCI init before SPI init
It is possible that our PCI bus will provide the SPI controller, so change
the init order to make this work.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lib/board.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 452e5d8262..f372898f61 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -164,13 +164,13 @@ init_fnc_t *init_sequence_r[] = { #ifndef CONFIG_SYS_NO_FLASH flash_init_r, #endif -#ifdef CONFIG_SPI - init_func_spi; -#endif - env_relocate_r, #ifdef CONFIG_PCI pci_init_r, #endif +#ifdef CONFIG_SPI + init_func_spi, +#endif + env_relocate_r, stdio_init, jumptable_init_r, console_init_r, |