summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRobert Winkler <robert.winkler@boundarydevices.com>2013-06-17 11:31:29 -0700
committerJason Liu <r64343@freescale.com>2013-11-22 13:11:03 +0800
commit46ed430cf175585c4b2926d648c90efaf9bbec49 (patch)
treebdcdc06a1b5ea33127aea172f990077e5f5de1c8 /drivers
parent9589ff33327fc038be7c302e71377582738d8fde (diff)
downloadu-boot-imx-46ed430cf175585c4b2926d648c90efaf9bbec49.zip
u-boot-imx-46ed430cf175585c4b2926d648c90efaf9bbec49.tar.gz
u-boot-imx-46ed430cf175585c4b2926d648c90efaf9bbec49.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> (cherry picked from commit dd4425e85260c2e750676e2dc9c225cfff1b4bcd) Signed-off-by: Jason Liu <r64343@freescale.com>
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 b769222..35ef5cd 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -177,6 +177,8 @@
*/
#include <video_fb.h>
+#include <splash.h>
+
/*
* some Macros
*/
@@ -1991,10 +1993,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) {