Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx

[karo-tx-uboot.git] / common / serial.c

diff --git a/common/serial.c b/common/serial.c
index f89bb0a7a2c2a05a311a24020dbd97b4efa150ee..13e9f30e414b7925d637c8084a2be99e69961449 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -25,29 +25,48 @@
 #include <serial.h>
 #include <devices.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #if defined(CONFIG_SERIAL_MULTI)
 
 static struct serial_device *serial_devices = NULL;
 static struct serial_device *serial_current = NULL;
 
 #ifndef CONFIG_LWMON
-struct serial_device * default_serial_console (void)
+struct serial_device *default_serial_console (void)
 {
 #if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2)
        return &serial_smc_device;
 #elif defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \
    || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
        return &serial_scc_device;
+#elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \
+   || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_MPC5xxx)
+#if defined(CONFIG_CONS_INDEX) && defined(CFG_NS16550_SERIAL)
+#if (CONFIG_CONS_INDEX==1)
+       return &eserial1_device;
+#elif (CONFIG_CONS_INDEX==2)
+       return &eserial2_device;
+#elif (CONFIG_CONS_INDEX==3)
+       return &eserial3_device;
+#elif (CONFIG_CONS_INDEX==4)
+       return &eserial4_device;
+#else
+#error "Bad CONFIG_CONS_INDEX."
+#endif
+#elif defined(CONFIG_UART1_CONSOLE)
+               return &serial1_device;
+#else
+               return &serial0_device;
+#endif
 #else
 #error No default console
 #endif
 }
 #endif
 
-static int serial_register(struct serial_device* dev)
+static int serial_register (struct serial_device *dev)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        dev->init += gd->reloc_off;
        dev->setbrg += gd->reloc_off;
        dev->getc += gd->reloc_off;
@@ -61,26 +80,45 @@ static int serial_register(struct serial_device* dev)
        return 0;
 }
 
-void serial_initialize(void)
+void serial_initialize (void)
 {
 #if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2)
-       serial_register(&serial_smc_device);
+       serial_register (&serial_smc_device);
 #endif
 #if defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \
  || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
-       serial_register(&serial_scc_device);
+       serial_register (&serial_scc_device);
+#endif
+
+#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \
+ || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_MPC5xxx)
+       serial_register(&serial0_device);
+       serial_register(&serial1_device);
 #endif
 
-       serial_assign(default_serial_console()->name);
+#if defined(CFG_NS16550_SERIAL)
+#if defined(CFG_NS16550_COM1)
+       serial_register(&eserial1_device);
+#endif
+#if defined(CFG_NS16550_COM2)
+       serial_register(&eserial2_device);
+#endif
+#if defined(CFG_NS16550_COM3)
+       serial_register(&eserial3_device);
+#endif
+#if defined(CFG_NS16550_COM4)
+       serial_register(&eserial4_device);
+#endif
+#endif /* CFG_NS16550_SERIAL */
+       serial_assign (default_serial_console ()->name);
 }
 
-void serial_devices_init(void)
+void serial_devices_init (void)
 {
        device_t dev;
        struct serial_device *s = serial_devices;
 
-       while (s)
-       {
+       while (s) {
                memset (&dev, 0, sizeof (dev));
 
                strcpy (dev.name, s->name);
@@ -98,14 +136,12 @@ void serial_devices_init(void)
        }
 }
 
-int serial_assign(char * name)
+int serial_assign (char *name)
 {
        struct serial_device *s;
 
-       for (s = serial_devices; s; s = s->next)
-       {
-               if (strcmp(s->name, name) == 0)
-               {
+       for (s = serial_devices; s; s = s->next) {
+               if (strcmp (s->name, name) == 0) {
                        serial_current = s;
                        return 0;
                }
@@ -114,83 +150,82 @@ int serial_assign(char * name)
        return 1;
 }
 
-void serial_reinit_all(void)
+void serial_reinit_all (void)
 {
        struct serial_device *s;
 
-       for (s = serial_devices; s; s = s->next)
-       {
-               s->init();
+       for (s = serial_devices; s; s = s->next) {
+               s->init ();
        }
 }
 
-int serial_init(void)
+int serial_init (void)
 {
-       if (!serial_current)
-       {
-               struct serial_device *dev = default_serial_console();
-               return dev->init();
+       if (!(gd->flags & GD_FLG_RELOC) || !serial_current) {
+               struct serial_device *dev = default_serial_console ();
+
+               return dev->init ();
        }
 
-       return serial_current->init();
+       return serial_current->init ();
 }
 
-void serial_setbrg(void)
+void serial_setbrg (void)
 {
-       if (!serial_current)
-       {
-               struct serial_device *dev = default_serial_console();
-               dev->setbrg();
+       if (!(gd->flags & GD_FLG_RELOC) || !serial_current) {
+               struct serial_device *dev = default_serial_console ();
+
+               dev->setbrg ();
                return;
        }
 
-       serial_current->setbrg();
+       serial_current->setbrg ();
 }
 
-int serial_getc(void)
+int serial_getc (void)
 {
-       if (!serial_current)
-       {
-               struct serial_device *dev = default_serial_console();
-               return dev->getc();
+       if (!(gd->flags & GD_FLG_RELOC) || !serial_current) {
+               struct serial_device *dev = default_serial_console ();
+
+               return dev->getc ();
        }
 
-       return serial_current->getc();
+       return serial_current->getc ();
 }
 
-int serial_tstc(void)
+int serial_tstc (void)
 {
-       if (!serial_current)
-       {
-               struct serial_device *dev = default_serial_console();
-               return dev->tstc();
+       if (!(gd->flags & GD_FLG_RELOC) || !serial_current) {
+               struct serial_device *dev = default_serial_console ();
+
+               return dev->tstc ();
        }
 
-       return serial_current->tstc();
+       return serial_current->tstc ();
 }
 
-void serial_putc(const char c)
+void serial_putc (const char c)
 {
-       if (!serial_current)
-       {
-               struct serial_device *dev = default_serial_console();
-               dev->putc(c);
+       if (!(gd->flags & GD_FLG_RELOC) || !serial_current) {
+               struct serial_device *dev = default_serial_console ();
+
+               dev->putc (c);
                return;
        }
 
-       serial_current->putc(c);
+       serial_current->putc (c);
 }
 
-void serial_puts(const char *s)
+void serial_puts (const char *s)
 {
-       if (!serial_current)
-       {
-               struct serial_device *dev = default_serial_console();
-               dev->puts(s);
+       if (!(gd->flags & GD_FLG_RELOC) || !serial_current) {
+               struct serial_device *dev = default_serial_console ();
+
+               dev->puts (s);
                return;
        }
 
-       serial_current->puts(s);
+       serial_current->puts (s);
 }
 
 #endif /* CONFIG_SERIAL_MULTI */