Skip to content
Snippets Groups Projects
Commit b4fc6f22 authored by Anatolij Gustschin's avatar Anatolij Gustschin
Browse files

video: cfb_console: fix hang if splashimage file is missing


If the splash file doesn't exist, the booting stops bricking
the boards. Check return value of prepare function and stop
decoding the logo data if splash prepare stage failed.

Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
parent db1b79b8
No related branches found
No related tags found
No related merge requests found
......@@ -1861,14 +1861,16 @@ static void *video_logo(void)
__maybe_unused int y_off = 0;
__maybe_unused ulong addr;
__maybe_unused char *s;
__maybe_unused int len, space;
__maybe_unused int len, ret, space;
splash_get_pos(&video_logo_xpos, &video_logo_ypos);
#ifdef CONFIG_SPLASH_SCREEN
s = getenv("splashimage");
if (s != NULL) {
splash_screen_prepare();
ret = splash_screen_prepare();
if (ret < 0)
return video_fb_address;
addr = simple_strtoul(s, NULL, 16);
if (video_display_bitmap(addr,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment