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

[oweals/u-boot.git] / cpu / blackfin / initcode.c

diff --git a/cpu/blackfin/initcode.c b/cpu/blackfin/initcode.c
index aba00e0fb9aa87b7239ab90f3cbd573bf553544f..a039cbbbce12d4969b5d9a3f9b2b2452da37f721 100644 (file)
--- a/cpu/blackfin/initcode.c
+++ b/cpu/blackfin/initcode.c
@@ -92,7 +92,7 @@ static inline void serial_putc(char c)
                return;
 
        if (c == '\n')
-               *pUART_THR = '\r';
+               serial_putc('\r');
 
        *pUART_THR = c;
 
@@ -543,9 +543,11 @@ void initcode(ADI_BOOT_DATA *bootstruct)
 
        serial_putc('T');
 
+#ifdef CONFIG_BFIN_BOOTROM_USES_EVT1
        /* tell the bootrom where our entry point is */
        if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_BYPASS)
                bfin_write_EVT1(CONFIG_SYS_MONITOR_BASE);
+#endif
 
        serial_putc('>');
        serial_putc('\n');