qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board_f: Use a single condition for reserve_logbuffer() 

CONFIG_ALT_LB_ADDR is really a detail of how this logbuffer is allocated
rather than whether to do it at all. So move the #ifdef into the function.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-03-31 08:40:28 -06:00 committed by Tom Rini
parent c67f432ecd
commit b56db48615
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/board_f.c
View File

@ -337,13 +337,16 @@ static int setup_dest_addr(void)
return 0; return 0;
} }
#if defined(CONFIG_LOGBUFFER) && !defined(CONFIG_ALT_LB_ADDR) #if defined(CONFIG_LOGBUFFER)
static int reserve_logbuffer(void) static int reserve_logbuffer(void)
{ {
#ifndef CONFIG_ALT_LB_ADDR
/* reserve kernel log buffer */ /* reserve kernel log buffer */
gd->relocaddr -= LOGBUFF_RESERVE; gd->relocaddr -= LOGBUFF_RESERVE;
debug("Reserving %dk for kernel logbuffer at %08lx\n", LOGBUFF_LEN, debug("Reserving %dk for kernel logbuffer at %08lx\n", LOGBUFF_LEN,
gd->relocaddr); gd->relocaddr);
#endif
return 0; return 0;
} }
#endif #endif
@ -887,7 +890,7 @@ static const init_fnc_t init_sequence_f[] = {
* - board info struct * - board info struct
*/ */
setup_dest_addr, setup_dest_addr,
#if defined(CONFIG_LOGBUFFER) && !defined(CONFIG_ALT_LB_ADDR) #if defined(CONFIG_LOGBUFFER)
reserve_logbuffer, reserve_logbuffer,
#endif #endif
#ifdef CONFIG_PRAM #ifdef CONFIG_PRAM