Enable displaying of u-boot video logo as default at SPL stage to if
splash screen is disabled at SPL stage. Use CONFIG_IS_ENABLED for
checking on splash screen macro both at SPL stage or u-boot proper
depending upon where it is enabled.
Signed-off-by: Nikhil M Jain <n-ja...@ti.com>
Reviewed-by: Devarsh Thakkar <devar...@ti.com>
---
drivers/video/Kconfig | 2 +-
drivers/video/video-uclass.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 1097e2c623..96e0f367d7 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -28,7 +28,7 @@ if VIDEO || SPL_VIDEO
config VIDEO_LOGO
bool "Show the U-Boot logo on the display"
- default y if !SPLASH_SCREEN
+ default y if !SPLASH_SCREEN || !SPL_SPLASH_SCREEN
select VIDEO_BMP_RLE8
help
This enables showing the U-Boot logo on the display when a video
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 6aaacff10d..5e473c1686 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -498,7 +498,7 @@ static int video_post_probe(struct udevice *dev)
}
if (IS_ENABLED(CONFIG_VIDEO_LOGO) &&
- !IS_ENABLED(CONFIG_SPLASH_SCREEN) && !plat->hide_logo) {
+ !CONFIG_IS_ENABLED(SPLASH_SCREEN) && !plat->hide_logo) {
ret = show_splash(dev);
if (ret) {
log_debug("Cannot show splash screen\n");
--
2.34.1
