spl: Remove unused CONFIG_SPL_FRAMEWORK_BOARD_INIT_F option

The option CONFIG_SPL_FRAMEWORK_BOARD_INIT_F enables a simple
board_init_f function in SPL. This however is never enabled, so remove
this function and option.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 57b2bef5e541df75f1763ec7e8ebf8b8e14b9d8b..a21b71ad5d196acbd124b58f6156a836ca4ac959 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -27,15 +27,6 @@ config SPL_FRAMEWORK
          supports MMC, NAND and YMODEM and other methods loading of U-Boot
          and the Linux Kernel.  If unsure, say Y.
 
-config SPL_FRAMEWORK_BOARD_INIT_F
-       bool "Define a generic function board_init_f"
-       depends on SPL_FRAMEWORK
-       help
-         Define a generic function board_init_f that:
-         - initialize the spl (spl_early_init)
-         - initialize the serial (preloader_console_init)
-         Unless you want to provide your own board_init_f, you should say Y.
-
 config SPL_SIZE_LIMIT
        hex "Maximum size of SPL image"
        default 0x11000 if ARCH_MX6 && !MX6_OCRAM_256KB

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 8256fa9786293c8f4ecb7e7754ea15be030f5028..722b18c98edc500d080e299d33eac201361f2584 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -669,23 +669,6 @@ static int boot_from_devices(struct spl_image_info *spl_image,
        return ret;
 }
 
-#if defined(CONFIG_SPL_FRAMEWORK_BOARD_INIT_F)
-void board_init_f(ulong dummy)
-{
-       if (CONFIG_IS_ENABLED(OF_CONTROL)) {
-               int ret;
-
-               ret = spl_early_init();
-               if (ret) {
-                       debug("spl_early_init() failed: %d\n", ret);
-                       hang();
-               }
-       }
-
-       preloader_console_init();
-}
-#endif
-
 void board_init_r(gd_t *dummy1, ulong dummy2)
 {
        u32 spl_boot_list[] = {