diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-18 19:52:20 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-01-20 19:10:15 -0700 |
| commit | 8703ef3fdbfda239bcc67818e9b0f6ddaa7f6ad4 (patch) | |
| tree | f899dcd7a9a3414d62c3e60eb0f4bd17d96ff647 /common | |
| parent | b5146b2811b69775c88a51bc1275377369d6d3b3 (diff) | |
common: Move LCD and video memory reservation together
These two functions are conceptually the same. Move them together in the
pre-relocation init.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/common/board_f.c b/common/board_f.c index 8094ac4efe..068db0d74e 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -451,22 +451,10 @@ static int reserve_lcd(void) } #endif /* CONFIG_LCD */ -static int reserve_trace(void) -{ -#ifdef CONFIG_TRACE - gd->relocaddr -= CONFIG_TRACE_BUFFER_SIZE; - gd->trace_buff = map_sysmem(gd->relocaddr, CONFIG_TRACE_BUFFER_SIZE); - debug("Reserving %dk for trace data at: %08lx\n", - CONFIG_TRACE_BUFFER_SIZE >> 10, gd->relocaddr); -#endif - - return 0; -} - #if defined(CONFIG_VIDEO) && (!defined(CONFIG_PPC) || defined(CONFIG_8xx)) && \ !defined(CONFIG_ARM) && !defined(CONFIG_X86) && \ !defined(CONFIG_BLACKFIN) && !defined(CONFIG_M68K) -static int reserve_video(void) +static int reserve_legacy_video(void) { /* reserve memory for video display (always full pages) */ gd->relocaddr = video_setmem(gd->relocaddr); @@ -476,6 +464,18 @@ static int reserve_video(void) } #endif +static int reserve_trace(void) +{ +#ifdef CONFIG_TRACE + gd->relocaddr -= CONFIG_TRACE_BUFFER_SIZE; + gd->trace_buff = map_sysmem(gd->relocaddr, CONFIG_TRACE_BUFFER_SIZE); + debug("Reserving %dk for trace data at: %08lx\n", + CONFIG_TRACE_BUFFER_SIZE >> 10, gd->relocaddr); +#endif + + return 0; +} + static int reserve_uboot(void) { /* @@ -960,13 +960,13 @@ static init_fnc_t init_sequence_f[] = { #ifdef CONFIG_LCD reserve_lcd, #endif - reserve_trace, /* TODO: Why the dependency on CONFIG_8xx? */ #if defined(CONFIG_VIDEO) && (!defined(CONFIG_PPC) || defined(CONFIG_8xx)) && \ !defined(CONFIG_ARM) && !defined(CONFIG_X86) && \ !defined(CONFIG_BLACKFIN) && !defined(CONFIG_M68K) reserve_video, #endif + reserve_trace, #if !defined(CONFIG_BLACKFIN) reserve_uboot, #endif |