diff options
| author | Fabio Estevam <festevam@denx.de> | 2022-03-28 16:40:36 -0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-31 08:27:51 -0400 |
| commit | 25a448333da234b67ecc2235fc4fb4f598c8b6e7 (patch) | |
| tree | a34599cef2d08b3a31c566e3dda641b6f1f41352 | |
| parent | 051df08fe072c3790c159d7b9966513325eb04ec (diff) | |
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
| -rw-r--r-- | drivers/video/video-uclass.c | 3 |
1 files changed, 2 insertions, 1 deletions
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"); |