Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge git://git.denx.de/u-boot-dm

Browse source
This commit is contained in:
Tom Rini 2015-08-10 10:06:07 -04:00
commit e2c1c5bae6
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/serial/Kconfig
View file

@ -1,3 +1,14 @@
config REQUIRE_SERIAL_CONSOLE
bool "Require a serial port for console"
# Running without a serial console is not supported by the
# non-dm serial code
depends on DM_SERIAL
default y
help
Require a serial port for the console, and panic if none is found
during serial port initialization (default y). Set this to n on
boards which have no debug serial port whatsoever.
config DM_SERIAL config DM_SERIAL
bool "Enable Driver Model for serial drivers" bool "Enable Driver Model for serial drivers"
depends on DM depends on DM

20
drivers/serial/serial-uclass.c
View file

@ -78,7 +78,9 @@ static void serial_find_console_or_panic(void)
#undef INDEX #undef INDEX
} }
#ifdef CONFIG_REQUIRE_SERIAL_CONSOLE
panic_str("No serial driver found"); panic_str("No serial driver found");
#endif
} }
/* Called prior to relocation */ /* Called prior to relocation */
@ -140,28 +142,40 @@ static int _serial_tstc(struct udevice *dev)
void serial_putc(char ch) void serial_putc(char ch)
{ {
_serial_putc(gd->cur_serial_dev, ch); if (gd->cur_serial_dev)
_serial_putc(gd->cur_serial_dev, ch);
} }
void serial_puts(const char *str) void serial_puts(const char *str)
{ {
_serial_puts(gd->cur_serial_dev, str); if (gd->cur_serial_dev)
_serial_puts(gd->cur_serial_dev, str);
} }
int serial_getc(void) int serial_getc(void)
{ {
if (!gd->cur_serial_dev)
return 0;
return _serial_getc(gd->cur_serial_dev); return _serial_getc(gd->cur_serial_dev);
} }
int serial_tstc(void) int serial_tstc(void)
{ {
if (!gd->cur_serial_dev)
return 0;
return _serial_tstc(gd->cur_serial_dev); return _serial_tstc(gd->cur_serial_dev);
} }
void serial_setbrg(void) void serial_setbrg(void)
{ {
struct dm_serial_ops *ops = serial_get_ops(gd->cur_serial_dev); struct dm_serial_ops *ops;
if (!gd->cur_serial_dev)
return;
ops = serial_get_ops(gd->cur_serial_dev);
if (ops->setbrg) if (ops->setbrg)
ops->setbrg(gd->cur_serial_dev, gd->baudrate); ops->setbrg(gd->cur_serial_dev, gd->baudrate);
} }