Patchwork [U-Boot,12/15] x86: Move PCI init before SPI init

login
register
mail settings
Submitter Simon Glass
Date Dec. 26, 2012, 10:28 p.m.
Message ID <1356560913-2205-13-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/208239/
State Superseded, archived
Delegated to: Simon Glass
Headers show

Comments

Simon Glass - Dec. 26, 2012, 10:28 p.m.
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>
---
 arch/x86/lib/board.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index 555301a..c2407e4 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,