nand: mxs: use CONFIG_ARCH_MX6 instead of CONFIG_SOC_MX6Q

[karo-tx-uboot.git] / drivers / serial / serial-uclass.c

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index b239691efe945ba77d02429243a81186ded32454..55011cc4b9a7e6a36dd5039e5a501c6afc85d86e 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -30,49 +30,57 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
 static void serial_find_console_or_panic(void)
 {
        struct udevice *dev;
-
-#ifdef CONFIG_OF_CONTROL
        int node;
 
-       /* Check for a chosen console */
-       node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path");
-       if (node < 0)
-               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;
-       }
-
-       /*
-        * If the console is not marked to be bound before relocation, bind
-        * it anyway.
-        */
-       if (node > 0 &&
-           !lists_bind_fdt(gd->dm_root, gd->fdt_blob, node, &dev)) {
-               if (!device_probe(dev)) {
+       if (CONFIG_IS_ENABLED(OF_CONTROL) && gd->fdt_blob) {
+               /* Check for a chosen console */
+               node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path");
+               if (node < 0)
+                       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;
                }
+
+               /*
+               * If the console is not marked to be bound before relocation,
+               * bind it anyway.
+               */
+               if (node > 0 &&
+                   !lists_bind_fdt(gd->dm_root, gd->fdt_blob, node, &dev)) {
+                       if (!device_probe(dev)) {
+                               gd->cur_serial_dev = dev;
+                               return;
+                       }
+               }
        }
-#endif
-       /*
-        * Try to use CONFIG_CONS_INDEX if available (it is numbered from 1!).
-        *
-        * 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
-        * a console (even if it is silent).
-        */
+       if (!SPL_BUILD || !CONFIG_IS_ENABLED(OF_CONTROL) || !gd->fdt_blob) {
+               /*
+               * Try to use CONFIG_CONS_INDEX if available (it is numbered
+               * from 1!).
+               *
+               * 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 a console (even if it is silent).
+               */
 #ifdef CONFIG_CONS_INDEX
 #define INDEX (CONFIG_CONS_INDEX - 1)
 #else
 #define INDEX 0
 #endif
-       if (uclass_get_device_by_seq(UCLASS_SERIAL, INDEX, &dev) &&
-           uclass_get_device(UCLASS_SERIAL, INDEX, &dev) &&
-           (uclass_first_device(UCLASS_SERIAL, &dev) || !dev))
-               panic("No serial driver found");
+               if (!uclass_get_device_by_seq(UCLASS_SERIAL, INDEX, &dev) ||
+                   !uclass_get_device(UCLASS_SERIAL, INDEX, &dev) ||
+                   (!uclass_first_device(UCLASS_SERIAL, &dev) && dev)) {
+                       gd->cur_serial_dev = dev;
+                       return;
+               }
 #undef INDEX
-       gd->cur_serial_dev = dev;
+       }
+
+#ifdef CONFIG_REQUIRE_SERIAL_CONSOLE
+       panic_str("No serial driver found");
+#endif
 }
 
 /* Called prior to relocation */
@@ -134,28 +142,40 @@ static int _serial_tstc(struct udevice *dev)
 
 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)
 {
-       _serial_puts(gd->cur_serial_dev, str);
+       if (gd->cur_serial_dev)
+               _serial_puts(gd->cur_serial_dev, str);
 }
 
 int serial_getc(void)
 {
+       if (!gd->cur_serial_dev)
+               return 0;
+
        return _serial_getc(gd->cur_serial_dev);
 }
 
 int serial_tstc(void)
 {
+       if (!gd->cur_serial_dev)
+               return 0;
+
        return _serial_tstc(gd->cur_serial_dev);
 }
 
 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)
                ops->setbrg(gd->cur_serial_dev, gd->baudrate);
 }