From: Simon Glass <sjg@chromium.org>
Date: Mon, 11 Mar 2013 06:08:09 +0000 (+0000)
Subject: x86: Move PCI init before SPI init
X-Git-Tag: v2013.04-rc2~22^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=192868b0614e68d165fffe9996c6c45db1c47fcb;p=oweals%2Fu-boot.git

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>
---

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,