blackfin: Enable early print via the generic serial API.

[karo-tx-uboot.git] / arch / blackfin / cpu / serial.h

diff --git a/arch/blackfin/cpu/serial.h b/arch/blackfin/cpu/serial.h
index d67fd81c0964c5dbf087915d6490119a78f8b190..87a337d1b4e8b862e3a6cab8ff819a5794958ed7 100644 (file)
--- a/arch/blackfin/cpu/serial.h
+++ b/arch/blackfin/cpu/serial.h
@@ -78,16 +78,16 @@ static inline void serial_early_puts(const char *s)
 #else
 
 .macro serial_early_init
-#if defined(CONFIG_DEBUG_EARLY_SERIAL) && defined(BFIN_BOOT_BYPASS)
-       call _serial_initialize;
+#if defined(CONFIG_DEBUG_EARLY_SERIAL) && !defined(CONFIG_UART_MEM)
+       call __serial_early_init;
 #endif
 .endm
 
 .macro serial_early_set_baud
-#if defined(CONFIG_DEBUG_EARLY_SERIAL) && defined(BFIN_BOOT_BYPASS)
+#if defined(CONFIG_DEBUG_EARLY_SERIAL) && !defined(CONFIG_UART_MEM)
        R0.L = LO(CONFIG_BAUDRATE);
        R0.H = HI(CONFIG_BAUDRATE);
-       call _serial_set_baud;
+       call __serial_early_set_baud;
 #endif
 .endm
 
@@ -121,7 +121,7 @@ static inline void serial_early_puts(const char *s)
        R0.L = 7b; \
        R0.H = 7b; \
        update_serial_early_string_addr \
-       call _serial_puts;
+       call _uart_early_puts;
 #else
 # define serial_early_puts(str)
 #endif