From patchwork Mon Mar 11 16:08:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot,v2,11/15] x86: Move PCI init before SPI init From: Simon Glass X-Patchwork-Id: 226579 Message-Id: <1363018093-28979-12-git-send-email-sjg@chromium.org> To: U-Boot Mailing List Cc: Graeme Russ , Tom Warren Date: Mon, 11 Mar 2013 09:08:09 -0700 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 --- Changes in v2: None arch/x86/lib/board.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 2441a66..e727374 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -163,13 +163,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,