From: Fabio Estevam festevam@denx.de
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 --- 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 88797d4a21c2..42f9245ea8c5 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");