From 8b607b00bd13a828e61e9d14839037b36772ab0d Mon Sep 17 00:00:00 2001 From: tiopex <67048640+tiopex@users.noreply.github.com> Date: Fri, 29 Dec 2023 21:59:09 +0100 Subject: [PATCH] [VIDEO] Show hardcoded logo (and console) if custom *.bmp splash file is missing (#32) --- drivers/video/cfb_console.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 6495e22b1..a1e10d496 100755 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1868,15 +1868,16 @@ static void *video_logo(void) s = env_get("splashimage"); if (s != NULL) { ret = splash_screen_prepare(); - if (ret < 0) - return video_fb_address; - addr = simple_strtoul(s, NULL, 16); - - if (video_display_bitmap(addr, + if (ret == 0) { + addr = simple_strtoul(s, NULL, 16); + if (video_display_bitmap(addr, video_logo_xpos, video_logo_ypos) == 0) { - video_logo_height = 0; - return ((void *) (video_fb_address)); + video_logo_height = 0; + return ((void *) (video_fb_address)); + } + } else { + env_set("silent", ""); } } #endif /* CONFIG_SPLASH_SCREEN */