diff options
| author | Simon Glass <sjg@chromium.org> | 2017-03-31 08:40:28 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 16:36:48 -0400 |
| commit | b56db48615a86b4e4dc36827c499e779af98304f (patch) | |
| tree | 32167fd4769c20493f50fed8840b51ce4b19bcbd /common/board_f.c | |
| parent | c67f432ecd35386457c004f0fa7812d777593347 (diff) | |
| download | u-boot-b56db48615a86b4e4dc36827c499e779af98304f.tar.gz u-boot-b56db48615a86b4e4dc36827c499e779af98304f.tar.bz2 u-boot-b56db48615a86b4e4dc36827c499e779af98304f.zip | |
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>
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/board_f.c b/common/board_f.c index 1400cc818c..d76aab7633 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -337,13 +337,16 @@ static int setup_dest_addr(void) return 0; } -#if defined(CONFIG_LOGBUFFER) && !defined(CONFIG_ALT_LB_ADDR) +#if defined(CONFIG_LOGBUFFER) static int reserve_logbuffer(void) { +#ifndef CONFIG_ALT_LB_ADDR /* reserve kernel log buffer */ gd->relocaddr -= LOGBUFF_RESERVE; debug("Reserving %dk for kernel logbuffer at %08lx\n", LOGBUFF_LEN, gd->relocaddr); +#endif + return 0; } #endif @@ -887,7 +890,7 @@ static const init_fnc_t init_sequence_f[] = { * - board info struct */ setup_dest_addr, -#if defined(CONFIG_LOGBUFFER) && !defined(CONFIG_ALT_LB_ADDR) +#if defined(CONFIG_LOGBUFFER) reserve_logbuffer, #endif #ifdef CONFIG_PRAM |