From: Fabio Estevam <festevam@denx.de>
Date: Mon, 28 Mar 2022 19:40:36 +0000 (-0300)
Subject: video: Do not show splash and U-Boot logo simultaneously
X-Git-Tag: v2022.04~5^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25a448333da234b67ecc2235fc4fb4f598c8b6e7;p=thirdparty%2Fu-boot.git

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 <tharvey@gateworks.com>
Signed-off-by: Fabio Estevam <festevam@denx.de>
Tested-by: Tim Harvey <tharvey@gateworks.com> #gw_ventana
---

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 88797d4a21c..f9c2c40a223 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");