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
This commit is contained in:
parent
051df08fe0
commit
25a448333d
@ -407,7 +407,8 @@ static int video_post_probe(struct udevice *dev)
|
|||||||
return ret;
|
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);
|
ret = show_splash(dev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
log_debug("Cannot show splash screen\n");
|
log_debug("Cannot show splash screen\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user