Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / arch / x86 / lib / board.c

diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index a13f5c0e109bca853307653116b26b32df401540..22bc26dde90643f1e8a82ae88564624c8f6bdd70 100644 (file)
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -99,10 +99,17 @@ typedef int (init_fnc_t) (void);
 init_fnc_t *init_sequence_f[] = {
        cpu_init_f,
        board_early_init_f,
+#ifdef CONFIG_OF_CONTROL
+       find_fdt,
+       fdtdec_check_fdt,
+#endif
        env_init,
        init_baudrate_f,
        serial_init,
        console_init_f,
+#ifdef CONFIG_OF_CONTROL
+       prepare_fdt,
+#endif
        dram_init_f,
        calculate_relocation_address,
 
@@ -153,6 +160,9 @@ init_fnc_t *init_sequence_r[] = {
        serial_initialize_r,
 #ifndef CONFIG_SYS_NO_FLASH
        flash_init_r,
+#endif
+#ifdef CONFIG_SPI
+       init_func_spi;
 #endif
        env_relocate_r,
 #ifdef CONFIG_PCI
@@ -164,9 +174,6 @@ init_fnc_t *init_sequence_r[] = {
 #ifdef CONFIG_MISC_INIT_R
        misc_init_r,
 #endif
-#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE)
-       pci_init_r,
-#endif
 #if defined(CONFIG_CMD_KGDB)
        kgdb_init_r,
 #endif