From 25a448333da234b67ecc2235fc4fb4f598c8b6e7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 28 Mar 2022 16:40:36 -0300 Subject: [PATCH] video: Do not show splash and U-Boot logo simultaneously Currently, on imx6sabresd and gwventana boards, the company logo and U-Boot logo are shown. The correct behavior is to show only the company logo, if available, and not both logos. Reported-by: Tim Harvey Signed-off-by: Fabio Estevam Tested-by: Tim Harvey #gw_ventana --- drivers/video/video-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 88797d4a21..f9c2c40a22 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -407,7 +407,8 @@ static int video_post_probe(struct udevice *dev) return ret; } - if (IS_ENABLED(CONFIG_VIDEO_LOGO) && !plat->hide_logo) { + if (IS_ENABLED(CONFIG_VIDEO_LOGO) && + !IS_ENABLED(CONFIG_SPLASH_SCREEN) && !plat->hide_logo) { ret = show_splash(dev); if (ret) { log_debug("Cannot show splash screen\n"); -- 2.39.5