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

[platform/kernel/u-boot.git] / common / board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index 835b724..149a722 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -24,7 +24,6 @@
 #include <os.h>
 #include <post.h>
 #include <relocate.h>
-#include <spi.h>
 #ifdef CONFIG_SPL
 #include <spl.h>
 #endif
@@ -262,16 +261,6 @@ __weak int init_func_vid(void)
 }
 #endif
 
-#if defined(CONFIG_HARD_SPI)
-static int init_func_spi(void)
-{
-       puts("SPI:   ");
-       spi_init();
-       puts("ready\n");
-       return 0;
-}
-#endif
-
 static int setup_mon_len(void)
 {
 #if defined(__ARM__) || defined(__MICROBLAZE__)
@@ -913,9 +902,6 @@ static const init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_VID) && !defined(CONFIG_SPL)
        init_func_vid,
 #endif
-#if defined(CONFIG_HARD_SPI)
-       init_func_spi,
-#endif
        announce_dram_init,
        dram_init,              /* configure available RAM banks */
 #ifdef CONFIG_POST