diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-15 12:06:22 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-15 12:06:22 (GMT) |
| commit | ebe621d5fb2f5c15aff50e0610372f2751fd152f (patch) | |
| tree | 12985b43f1a8500332de8e20274cc2dd26f5a040 /drivers/serial/serial-uclass.c | |
| parent | 36b898b6bea839de7141b65df6ec02a97615c467 (diff) | |
| parent | 1269625177f120d659f66b18de4b532b16c44561 (diff) | |
| download | u-boot-ebe621d5fb2f5c15aff50e0610372f2751fd152f.tar.xz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/serial/serial-uclass.c')
| -rw-r--r-- | drivers/serial/serial-uclass.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 0ce5c44..19f38e1 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -33,7 +33,13 @@ static void serial_find_console_or_panic(void) struct udevice *dev; int node; - if (CONFIG_IS_ENABLED(OF_CONTROL) && blob) { + if (CONFIG_IS_ENABLED(OF_PLATDATA)) { + uclass_first_device(UCLASS_SERIAL, &dev); + if (dev) { + gd->cur_serial_dev = dev; + return; + } + } else if (CONFIG_IS_ENABLED(OF_CONTROL) && blob) { /* Check for a chosen console */ node = fdtdec_get_chosen_node(blob, "stdout-path"); if (node < 0) { |