projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-usb
[oweals/u-boot.git]
/
common
/
stdio.c
diff --git
a/common/stdio.c
b/common/stdio.c
index 8e4a9beef4542dab055489c31589a0f4c64b3707..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,11
+16,9
@@
#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_
HARD_I2C) || defined(CONFIG_
SYS_I2C)
+#if defined(CONFIG_SYS_I2C)
#include <i2c.h>
#endif
#include <i2c.h>
#endif
@@
-151,9
+148,10
@@
static int stdio_probe_device(const char *name, enum uclass_id id,
*sdevp = NULL;
seq = trailing_strtoln(name, NULL);
if (seq == -1)
*sdevp = NULL;
seq = trailing_strtoln(name, NULL);
if (seq == -1)
+ seq = 0;
+ ret = uclass_get_device_by_seq(id, seq, &dev);
+ if (ret == -ENODEV)
ret = uclass_first_device_err(id, &dev);
ret = uclass_first_device_err(id, &dev);
- else
- ret = uclass_get_device_by_seq(id, seq, &dev);
if (ret) {
debug("No %s device for seq %d (%s)\n", uclass_get_name(id),
seq, name);
if (ret) {
debug("No %s device for seq %d (%s)\n", uclass_get_name(id),
seq, name);
@@
-173,12
+171,12
@@
static int stdio_probe_device(const char *name, enum uclass_id id,
}
#endif
}
#endif
-struct stdio_dev
*
stdio_get_by_name(const char *name)
+struct stdio_dev
*
stdio_get_by_name(const char *name)
{
struct list_head *pos;
struct stdio_dev *sdev;
{
struct list_head *pos;
struct stdio_dev *sdev;
- if(!name)
+ if
(!name)
return NULL;
list_for_each(pos, &(devs.list)) {
return NULL;
list_for_each(pos, &(devs.list)) {
@@
-345,9
+343,6
@@
int stdio_add_devices(void)
#ifdef CONFIG_SYS_I2C
i2c_init_all();
#else
#ifdef CONFIG_SYS_I2C
i2c_init_all();
#else
-#if defined(CONFIG_HARD_I2C)
- i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
#endif
#ifdef CONFIG_DM_VIDEO
/*
#endif
#ifdef CONFIG_DM_VIDEO
/*
@@
-372,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 ();
@@
-382,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 ();