POST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) with the...

[u-boot] / common / serial.c

diff --git a/common/serial.c b/common/serial.c
index b9916e2b5ec3a7ed3d3261363192c168d8f7690b..bfda7ca55135c96e01bcd8bf7ded3af5a846c5e5 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -33,7 +33,7 @@ static struct serial_device *serial_devices = NULL;
 static struct serial_device *serial_current = NULL;
 
 #if !defined(CONFIG_LWMON) && !defined(CONFIG_PXA27X)
-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;
@@ -60,10 +60,22 @@ struct serial_device *default_serial_console (void)
 #else
                return &serial0_device;
 #endif
+#elif defined(CONFIG_S3C2410)
+#if defined(CONFIG_SERIAL1)
+       return &s3c24xx_serial0_device;
+#elif defined(CONFIG_SERIAL2)
+       return &s3c24xx_serial1_device;
+#elif defined(CONFIG_SERIAL3)
+       return &s3c24xx_serial2_device;
+#else
+#error "CONFIG_SERIAL? missing."
+#endif
 #else
 #error No default console
 #endif
 }
+
+struct serial_device *default_serial_console(void) __attribute__((weak, alias("__default_serial_console")));
 #endif
 
 int serial_register (struct serial_device *dev)
@@ -120,6 +132,11 @@ void serial_initialize (void)
 #endif
 #if defined (CONFIG_STUART)
        serial_register(&serial_stuart_device);
+#endif
+#if defined(CONFIG_S3C2410)
+       serial_register(&s3c24xx_serial0_device);
+       serial_register(&s3c24xx_serial1_device);
+       serial_register(&s3c24xx_serial2_device);
 #endif
        serial_assign (default_serial_console ()->name);
 }