summaryrefslogtreecommitdiff
path: root/common/lcd.c
diff options
context:
space:
mode:
authorRobert Winkler <robert.winkler@boundarydevices.com>2013-06-17 11:31:29 -0700
committerAnatolij Gustschin <agust@denx.de>2013-07-01 21:45:22 +0200
commitdd4425e85260c2e750676e2dc9c225cfff1b4bcd (patch)
tree6086e9eef88070e2faebd3feb1c97f05195f41b8 /common/lcd.c
parentf7ef9d610cb28d31c106792f18b58424e39275c7 (diff)
downloadu-boot-imx-dd4425e85260c2e750676e2dc9c225cfff1b4bcd.zip
u-boot-imx-dd4425e85260c2e750676e2dc9c225cfff1b4bcd.tar.gz
u-boot-imx-dd4425e85260c2e750676e2dc9c225cfff1b4bcd.tar.bz2
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 <robert.winkler@boundarydevices.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'common/lcd.c')
-rw-r--r--common/lcd.c16
1 files changed, 3 insertions, 13 deletions
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 <lcd.h>
#include <watchdog.h>
+#include <splash.h>
+
#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