diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-10 09:41:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-10 09:41:19 -0400 |
| commit | 99e14d5249a1b46ec4a4321d6125449a8f09b549 (patch) | |
| tree | 6e5e4d72c8dbb4a542782514410c59181e0b1752 /common/lcd.c | |
| parent | eb53a18c9e903e35e8e8d52da96c33b63822881c (diff) | |
| parent | f944b15966d410fd81f6051a836f86d5263f617e (diff) | |
Merge tag 'video-updates-for-2019.07-rc3' of git://git.denx.de/u-boot-video
- mxsfb DM_VIDEO conversion
- splash fix for DM_VIDEO configurations
- meson HDMI fix for boards without hdmi-supply regulator
Diffstat (limited to 'common/lcd.c')
| -rw-r--r-- | common/lcd.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/common/lcd.c b/common/lcd.c index 95526b1e17e..b34754fe518 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; } } |