summaryrefslogtreecommitdiff
path: root/common/lcd.c
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@toradex.com>2019-05-29 09:01:43 +0000
committerAnatolij Gustschin <agust@denx.de>2019-06-04 23:20:43 +0200
commit5eb83c0ac114bf193de207f46118075a6c1621c5 (patch)
tree0b010a86e83eaaaa9c041bea399f92502b648d47 /common/lcd.c
parent38c2a8a00132b4dcc6a0bb5baf5146b9eb9eb2d2 (diff)
splash: display splash in DM_VIDEO configurations
Currently for CONFIG_DM_VIDEO=y setting splashimage env variable doesn't have any effect. Introduce a common function for both dm-video/lcd stacks, that checks env("splashimage") and invokes bmp_display() accordingly. For additional details please check discussion [1]. [1] https://lists.denx.de/pipermail/u-boot/2019-May/371002.html Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Diffstat (limited to 'common/lcd.c')
-rw-r--r--common/lcd.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/common/lcd.c b/common/lcd.c
index 95526b1e17..b34754fe51 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -171,8 +171,7 @@ int drv_lcd_init(void)
void lcd_clear(void)
{
int bg_color;
- char *s;
- ulong addr;
+ __maybe_unused ulong addr;
static int do_splash = 1;
#if LCD_BPP == LCD_COLOR8
/* Setting the palette */
@@ -222,14 +221,10 @@ void lcd_clear(void)
/* Paint the logo and retrieve LCD base address */
debug("[LCD] Drawing the logo...\n");
if (do_splash) {
- s = env_get("splashimage");
- if (s) {
+ if (splash_display() == 0) {
do_splash = 0;
- addr = simple_strtoul(s, NULL, 16);
- if (lcd_splash(addr) == 0) {
- lcd_sync();
- return;
- }
+ lcd_sync();
+ return;
}
}