summaryrefslogtreecommitdiff
path: root/drivers
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 /drivers
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 'drivers')
-rw-r--r--drivers/video/cfb_console.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index b10f159..785bbcf 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -181,6 +181,8 @@
*/
#include <video_fb.h>
+#include <splash.h>
+
/*
* some Macros
*/
@@ -1995,10 +1997,9 @@ static void *video_logo(void)
#ifdef CONFIG_SPLASH_SCREEN
s = getenv("splashimage");
if (s != NULL) {
-
+ splash_screen_prepare();
addr = simple_strtoul(s, NULL, 16);
-
if (video_display_bitmap(addr,
video_logo_xpos,
video_logo_ypos) == 0) {