On Tue, 28 May 2019 15:19:37 +0000 Igor Opaniuk igor.opaniuk@toradex.com wrote: ...
diff --git a/common/splash.c b/common/splash.c index d251b3b654..f026390393 100644 --- a/common/splash.c +++ b/common/splash.c @@ -80,11 +80,23 @@ void splash_get_pos(int *x, int *y) } #endif /* CONFIG_SPLASH_SCREEN_ALIGN */
-#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_LCD) -int lcd_splash(ulong addr) +/*
- Common function to show a splash image if env("splashimage") is set.
- Is used for both dm_video and lcd video stacks. For additional
- details please refer to doc/README.splashprepare.
- */
+#if defined(CONFIG_SPLASH_SCREEN)
splash_display() also depends on code in cmd/bmp.c so please use #if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) here to prevent link errors.
...
diff --git a/common/stdio.c b/common/stdio.c index ee22c1fd58..22de7aa491 100644 --- a/common/stdio.c +++ b/common/stdio.c
...
@@ -366,6 +367,9 @@ int stdio_add_devices(void) if (ret) printf("%s: Video device failed (ret=%d)\n", __func__, ret); #endif /* !CONFIG_SYS_CONSOLE_IS_IN_ENV */ +#ifdef CONFIG_SPLASH_SCREEN
#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP)
- splash_display();
+#endif /* CONFIG_SPLASH_SCREEN */ #else # if defined(CONFIG_LCD) drv_lcd_init ();
-- Anatolij