From 8703ef3fdbfda239bcc67818e9b0f6ddaa7f6ad4 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 18 Jan 2016 19:52:20 -0700 Subject: [PATCH] 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 Acked-by: Anatolij Gustschin --- common/board_f.c | 28 ++++++++++++++-------------- 1 file 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,6 +451,19 @@ static int reserve_lcd(void) } #endif /* CONFIG_LCD */ +#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_legacy_video(void) +{ + /* reserve memory for video display (always full pages) */ + gd->relocaddr = video_setmem(gd->relocaddr); + gd->fb_base = gd->relocaddr; + + return 0; +} +#endif + static int reserve_trace(void) { #ifdef CONFIG_TRACE @@ -463,19 +476,6 @@ static int reserve_trace(void) 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) -{ - /* reserve memory for video display (always full pages) */ - gd->relocaddr = video_setmem(gd->relocaddr); - gd->fb_base = gd->relocaddr; - - return 0; -} -#endif - 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