x86: Remove unused bios/pci code

[karo-tx-uboot.git] / arch / x86 / lib / board.c

diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index c7d89604cae88080a6b806c4c9089b87b774e89b..228c2c82261bafaa352d0e2d268048824fd5664d 100644 (file)
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -32,11 +32,13 @@
  */
 
 #include <common.h>
+#include <fdtdec.h>
 #include <watchdog.h>
 #include <stdio_dev.h>
 #include <asm/u-boot-x86.h>
 #include <asm/relocate.h>
 #include <asm/processor.h>
+#include <asm/sections.h>
 
 #include <asm/init_helpers.h>
 #include <asm/init_wrappers.h>
@@ -99,10 +101,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,
 
@@ -124,6 +133,7 @@ init_fnc_t *init_sequence_f[] = {
 init_fnc_t *init_sequence_f_r[] = {
        init_cache_f_r,
        copy_uboot_to_ram,
+       copy_fdt_to_ram,
        clear_bss,
        do_elf_reloc_fixups,
 
@@ -154,10 +164,13 @@ init_fnc_t *init_sequence_r[] = {
 #ifndef CONFIG_SYS_NO_FLASH
        flash_init_r,
 #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,
@@ -207,6 +220,7 @@ static void do_init_loop(init_fnc_t **init_fnc_ptr)
 
 void board_init_f(ulong boot_flags)
 {
+       gd->fdt_blob = gd->new_fdt = NULL;
        gd->flags = boot_flags;
 
        do_init_loop(init_sequence_f);
@@ -250,10 +264,3 @@ void board_init_r(gd_t *id, ulong dest_addr)
 
        /* NOTREACHED - no way out of command loop except booting */
 }
-
-void hang(void)
-{
-       puts("### ERROR ### Please RESET the board ###\n");
-       for (;;)
-               ;
-}