From: Simon Glass <sjg@chromium.org>
Date: Wed, 17 Sep 2014 15:02:40 +0000 (-0600)
Subject: dm: serial: Don't require device tree to configure a console
X-Git-Tag: v2014.10-rc3~64^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=59990bf0eaa12b123759cb0485f38e156103e93c;p=oweals%2Fu-boot.git

dm: serial: Don't require device tree to configure a console

Allow serial_find_console_or_panic() to work without a device tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index d04104e747..1ac943f692 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -25,6 +25,7 @@ struct udevice *cur_dev __attribute__ ((section(".data")));
 
 static void serial_find_console_or_panic(void)
 {
+#ifdef CONFIG_OF_CONTROL
 	int node;
 
 	/* Check for a chosen console */
@@ -44,7 +45,7 @@ static void serial_find_console_or_panic(void)
 			return;
 		cur_dev = NULL;
 	}
-
+#endif
 	/*
 	 * Failing that, get the device with sequence number 0, or in extremis
 	 * just the first serial device we can find. But we insist on having