From dd4425e85260c2e750676e2dc9c225cfff1b4bcd Mon Sep 17 00:00:00 2001 From: Robert Winkler Date: Mon, 17 Jun 2013 11:31:29 -0700 Subject: video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO Create splash.c/h to put the function and any future common splash screen code in. Signed-off-by: Robert Winkler Acked-by: Igor Grinberg --- common/lcd.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'common/lcd.c') diff --git a/common/lcd.c b/common/lcd.c index c9a589e..95006aa 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -43,6 +43,8 @@ #include #include +#include + #if defined(CONFIG_CPU_PXA25X) || defined(CONFIG_CPU_PXA27X) || \ defined(CONFIG_CPU_MONAHANS) #define CONFIG_CPU_PXA @@ -1072,18 +1074,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) } #endif -#ifdef CONFIG_SPLASH_SCREEN_PREPARE -static inline int splash_screen_prepare(void) -{ - return board_splash_screen_prepare(); -} -#else -static inline int splash_screen_prepare(void) -{ - return 0; -} -#endif - static void *lcd_logo(void) { #ifdef CONFIG_SPLASH_SCREEN @@ -1096,7 +1086,7 @@ static void *lcd_logo(void) do_splash = 0; if (splash_screen_prepare()) - return (void *)gd->fb_base; + return (void *)lcd_base; addr = simple_strtoul (s, NULL, 16); #ifdef CONFIG_SPLASH_SCREEN_ALIGN -- cgit v1.1