diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-31 08:28:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-31 08:28:43 -0400 |
| commit | 64b78f5721e65e96ea5a3d100d46b2e6fda722df (patch) | |
| tree | 37fd38e4ec59c6abcf1cc9c23c5bef1c09393dd4 /drivers | |
| parent | 0c60b657d8455784a58bfe08acff66a43dfccaad (diff) | |
| parent | 52ae8d6cc8b2f4ec53228e1d9216b5d9071cb325 (diff) | |
Merge branch '2022-03-31-critical-fixes'
- Fixes for 2 gateworks platforms, Edison platform, incorrectly showing
2 logos on LCD screens, not cleaning a generated environment file and
correct the CONFIG_SYS_IMMR Kconfig migration on a number of MPC85xx
platforms.
Diffstat (limited to 'drivers')
| -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"); |