summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-12-01 15:24:26 -0500
committerTom Rini <trini@ti.com>2014-12-01 15:24:26 -0500
commit88342103cccf73b39c764bfb1473e7bf29b52b88 (patch)
treec2d5accd809858328894d8e834b15752a88b2fef /drivers
parentf4e7e2d12164c3235c3f5e19a68a503623029d35 (diff)
parentffccb84c1a8e276fa7263ec4ca8186f06312305c (diff)
downloadu-boot-imx-88342103cccf73b39c764bfb1473e7bf29b52b88.zip
u-boot-imx-88342103cccf73b39c764bfb1473e7bf29b52b88.tar.gz
u-boot-imx-88342103cccf73b39c764bfb1473e7bf29b52b88.tar.bz2
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/serial-uclass.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index b09053f..d1b5777 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -39,7 +39,7 @@ static void serial_find_console_or_panic(void)
/* Check for a chosen console */
node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path");
if (node < 0)
- node = fdtdec_get_alias_node(gd->fdt_blob, "console");
+ node = fdt_path_offset(gd->fdt_blob, "console");
if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, &dev)) {
gd->cur_serial_dev = dev;
return;