Skip to contentSkip to conversation

spl: Remove unused CONFIG_SPL_FRAMEWORK_BOARD_INIT_F option

PATCH In review Tom Rini 1 participant 2 messages Mar 25 – Apr 8

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 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.

---
 common/spl/Kconfig |  9 ---------
 common/spl/spl.c   | 17 -----------------
 2 files changed, 26 deletions(-)
common/spl/Kconfig +0 -9
index 57b2bef5e541..a21b71ad5d19 100644
@@ -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
common/spl/spl.c +0 -17
index 8256fa978629..722b18c98edc 100644
@@ -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[] = {
Signature · 1 line
2.43.0
author
#1 lore raw
Quoted 5 lines · Tom Rini

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.

Applied to u-boot/master, thanks!

[1/1] spl: Remove unused CONFIG_SPL_FRAMEWORK_BOARD_INIT_F option

      commit: b9650a8e330bb2fdb83af28646f3777e9fb503bf
Signature · 1 line
Tom