x86: Move PCI init before SPI init
authorSimon Glass <sjg@chromium.org>
Mon, 11 Mar 2013 06:08:09 +0000 (06:08 +0000)
committerSimon Glass <sjg@chromium.org>
Tue, 19 Mar 2013 15:45:37 +0000 (08:45 -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 <sjg@chromium.org>
arch/x86/lib/board.c

index 452e5d8262b3e803b2950f07ecf8df45dae4d954..f372898f61276ea0dced65499d613797c9283f27 100644 (file)
@@ -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,