leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board_f: Drop CONFIG_SPL_BUILD check

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

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Simon Glass 2017-03-31 08:40:31 -06:00 committed by Tom Rini
parent 0f079eb51c
commit abf7f4c704
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/board_f.c
View File

@ -106,10 +106,6 @@ __weak void blue_led_off(void) {}
* a structure... * a structure...
*/ */
/*
* Could the CONFIG_SPL_BUILD infection become a flag in gd?
*/
#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG) #if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
static int init_func_watchdog_init(void) static int init_func_watchdog_init(void)
{ {
@ -464,7 +460,6 @@ static int reserve_uboot(void)
return 0; return 0;
} }
#ifndef CONFIG_SPL_BUILD
/* reserve memory for malloc() area */ /* reserve memory for malloc() area */
static int reserve_malloc(void) static int reserve_malloc(void)
{ {
@ -486,7 +481,6 @@ static int reserve_board(void)
} }
return 0; return 0;
} }
#endif
static int setup_machine(void) static int setup_machine(void)
{ {
@ -890,10 +884,8 @@ static const init_fnc_t init_sequence_f[] = {
reserve_video, reserve_video,
reserve_trace, reserve_trace,
reserve_uboot, reserve_uboot,
#ifndef CONFIG_SPL_BUILD
reserve_malloc, reserve_malloc,
reserve_board, reserve_board,
#endif
setup_machine, setup_machine,
reserve_global_data, reserve_global_data,
reserve_fdt, reserve_fdt,