Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / common / serial.c

diff --git a/common/serial.c b/common/serial.c
index e5ce9fd..94e1921 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -71,13 +71,13 @@ struct serial_device *__default_serial_console (void)
 #endif
 #elif defined(CONFIG_S5PC1XX)
 #if defined(CONFIG_SERIAL0)
-       return &s5pc1xx_serial0_device;
+       return &s5p_serial0_device;
 #elif defined(CONFIG_SERIAL1)
-       return &s5pc1xx_serial1_device;
+       return &s5p_serial1_device;
 #elif defined(CONFIG_SERIAL2)
-       return &s5pc1xx_serial2_device;
+       return &s5p_serial2_device;
 #elif defined(CONFIG_SERIAL3)
-       return &s5pc1xx_serial3_device;
+       return &s5p_serial3_device;
 #else
 #error "CONFIG_SERIAL? missing."
 #endif
@@ -93,12 +93,14 @@ struct serial_device *default_serial_console(void) __attribute__((weak, alias("_
 
 int serial_register (struct serial_device *dev)
 {
+#ifndef CONFIG_RELOC_FIXUP_WORKS
        dev->init += gd->reloc_off;
        dev->setbrg += gd->reloc_off;
        dev->getc += gd->reloc_off;
        dev->tstc += gd->reloc_off;
        dev->putc += gd->reloc_off;
        dev->puts += gd->reloc_off;
+#endif
 
        dev->next = serial_devices;
        serial_devices = dev;
@@ -152,10 +154,10 @@ void serial_initialize (void)
        serial_register(&s3c24xx_serial2_device);
 #endif
 #if defined(CONFIG_S5PC1XX)
-       serial_register(&s5pc1xx_serial0_device);
-       serial_register(&s5pc1xx_serial1_device);
-       serial_register(&s5pc1xx_serial2_device);
-       serial_register(&s5pc1xx_serial3_device);
+       serial_register(&s5p_serial0_device);
+       serial_register(&s5p_serial1_device);
+       serial_register(&s5p_serial2_device);
+       serial_register(&s5p_serial3_device);
 #endif
        serial_assign (default_serial_console ()->name);
 }