[U-Boot,v2,11/15] x86: Move PCI init before SPI init

Submitted by Simon Glass on March 11, 2013, 4:08 p.m.

Details

Message ID 1363018093-28979-12-git-send-email-sjg@chromium.org
State Accepted, archived
Delegated to: Tom Rini
Headers show

Commit Message

Simon Glass March 11, 2013, 4:08 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>
---
Changes in v2: None

 arch/x86/lib/board.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

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,