projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phy: meson: add GXBB PHY driver
[oweals/u-boot.git]
/
common
/
stdio.c
diff --git
a/common/stdio.c
b/common/stdio.c
index ee4f0bda9ea72f69efbefcaa3849a3f5b8f422ca..54ecc9b53db9c2354d3b2f30c2517c58c7c77891 100644
(file)
--- a/
common/stdio.c
+++ b/
common/stdio.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2009 Sergey Kubushyn <ksi@koi8.net>
*
/*
* Copyright (C) 2009 Sergey Kubushyn <ksi@koi8.net>
*
@@
-5,8
+6,6
@@
*
* (C) Copyright 2000
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
*
* (C) Copyright 2000
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <config.h>
*/
#include <config.h>
@@
-17,9
+16,7
@@
#include <malloc.h>
#include <stdio_dev.h>
#include <serial.h>
#include <malloc.h>
#include <stdio_dev.h>
#include <serial.h>
-#ifdef CONFIG_LOGBUFFER
-#include <logbuff.h>
-#endif
+#include <splash.h>
#if defined(CONFIG_SYS_I2C)
#include <i2c.h>
#if defined(CONFIG_SYS_I2C)
#include <i2c.h>
@@
-370,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 (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 ();
#else
# if defined(CONFIG_LCD)
drv_lcd_init ();
@@
-380,9
+380,6
@@
int stdio_add_devices(void)
#endif /* CONFIG_DM_VIDEO */
#if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD)
drv_keyboard_init ();
#endif /* CONFIG_DM_VIDEO */
#if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD)
drv_keyboard_init ();
-#endif
-#ifdef CONFIG_LOGBUFFER
- drv_logbuff_init ();
#endif
drv_system_init ();
serial_stdio_init ();
#endif
drv_system_init ();
serial_stdio_init ();