[U-Boot] [PATCH 08/16] board_f: Drop CONFIG_SPL_BUILD check

Simon Glass sjg at chromium.org
Fri Mar 31 14:40:31 UTC 2017


This is never defined when building this file, so drop it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 common/board_f.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/common/board_f.c b/common/board_f.c
index 230a9baf9c..7751c6c7e0 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -106,10 +106,6 @@ __weak void blue_led_off(void) {}
  * a structure...
  */
 
-/*
- * Could the CONFIG_SPL_BUILD infection become a flag in gd?
- */
-
 #if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
 static int init_func_watchdog_init(void)
 {
@@ -472,7 +468,6 @@ static int reserve_uboot(void)
 	return 0;
 }
 
-#ifndef CONFIG_SPL_BUILD
 /* reserve memory for malloc() area */
 static int reserve_malloc(void)
 {
@@ -494,7 +489,6 @@ static int reserve_board(void)
 	}
 	return 0;
 }
-#endif
 
 static int setup_machine(void)
 {
@@ -899,10 +893,8 @@ static const init_fnc_t init_sequence_f[] = {
 #if !defined(CONFIG_BLACKFIN)
 	reserve_uboot,
 #endif
-#ifndef CONFIG_SPL_BUILD
 	reserve_malloc,
 	reserve_board,
-#endif
 	setup_machine,
 	reserve_global_data,
 	reserve_fdt,
-- 
2.12.2.564.g063fe858b8-goog



More information about the U-Boot mailing list