video: Do not show splash and U-Boot logo simultaneously
PATCH 1/1 video: Do not show splash and U-Boot logo simultaneously
From: Fabio Estevam <[email protected]>
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.
--- drivers/video/video-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/video/video-uclass.c +2 -1
@@ -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" );
Signature · 1 line
2.25.1
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Currently, on imx6sabresd and gwventana boards, the company logo and U-Boot logo are shown.
Quoted 8 lines
The correct behavior is to show only the company logo, if available, and not both logos.
Reported-by Tim Harvey <[email protected]>Signed-off-by Fabio Estevam <[email protected]>--- drivers/video/video-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
This is probably good for the release, so I'll pick it up in a day or two, to give time for testing and feedback.
But, why do we end up even having both logos in the binary? That feels like an odd regression itself.
Signature · 1 line
Tom
Quoted 30 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
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 <[email protected]>Signed-off-by Fabio Estevam <[email protected]>--- drivers/video/video-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/video/video-uclass.c +2
-2@@ -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" ); --
Quoted 2 lines
2.25.1
Fabio,
Thanks for confirming this issue on imx6sabresd and submitting this fix!
Best regards,
Tim
Quoted 11 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
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 <[email protected]>Signed-off-by Fabio Estevam <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom