summaryrefslogtreecommitdiff
path: root/common/stdio.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-06-10 09:41:19 -0400
committerTom Rini <trini@konsulko.com>2019-06-10 09:41:19 -0400
commit99e14d5249a1b46ec4a4321d6125449a8f09b549 (patch)
tree6e5e4d72c8dbb4a542782514410c59181e0b1752 /common/stdio.c
parenteb53a18c9e903e35e8e8d52da96c33b63822881c (diff)
parentf944b15966d410fd81f6051a836f86d5263f617e (diff)
Merge tag 'video-updates-for-2019.07-rc3' of git://git.denx.de/u-boot-video
- mxsfb DM_VIDEO conversion - splash fix for DM_VIDEO configurations - meson HDMI fix for boards without hdmi-supply regulator
Diffstat (limited to 'common/stdio.c')
-rw-r--r--common/stdio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/stdio.c b/common/stdio.c
index ee22c1fd585..54ecc9b53db 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -16,6 +16,7 @@
#include <malloc.h>
#include <stdio_dev.h>
#include <serial.h>
+#include <splash.h>
#if defined(CONFIG_SYS_I2C)
#include <i2c.h>
@@ -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 */
+#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP)
+ splash_display();
+#endif /* CONFIG_SPLASH_SCREEN && CONFIG_CMD_BMP */
#else
# if defined(CONFIG_LCD)
drv_lcd_init ();