3 files changed, 2 insertions, 9 deletions
diff --git a/bsps/shared/grlib/uart/apbuart_cons.c b/bsps/shared/grlib/uart/apbuart_cons.c
index e4d026a4cc..e7dda50565 100644
--- a/bsps/shared/grlib/uart/apbuart_cons.c
+++ b/bsps/shared/grlib/uart/apbuart_cons.c
@@ -641,7 +641,7 @@ static void write_polled(
 	int nwrite = 0;
 
 	while (nwrite < len) {
-		apbuart_outbyte_polled(uart->regs, *buf++, 0, 0);
+		apbuart_outbyte_polled(uart->regs, *buf++, 0);
 		nwrite++;
 	}
 }
diff --git a/bsps/shared/grlib/uart/apbuart_polled.c b/bsps/shared/grlib/uart/apbuart_polled.c
index 0fbfbc51ba..948e0966b8 100644
--- a/bsps/shared/grlib/uart/apbuart_polled.c
+++ b/bsps/shared/grlib/uart/apbuart_polled.c
@@ -12,11 +12,9 @@
 void apbuart_outbyte_polled(
   struct apbuart_regs *regs,
   unsigned char ch,
-  int do_cr_on_newline,
   int wait_sent
 )
 {
-send:
   while ( (regs->status & APBUART_STATUS_TE) == 0 ) {
     /* Lower bus utilization while waiting for UART */
     __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
@@ -25,11 +23,6 @@ send:
     __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
   }
 
-  if ((ch == '\n') && do_cr_on_newline) {
-    regs->data = (unsigned int) '\r';
-    do_cr_on_newline = 0;
-    goto send;
-  }
   regs->data = (unsigned int) ch;
 
   /* Wait until the character has been sent? */
diff --git a/bsps/shared/grlib/uart/apbuart_termios.c b/bsps/shared/grlib/uart/apbuart_termios.c
index 81df89c171..5fb69902fe 100644
--- a/bsps/shared/grlib/uart/apbuart_termios.c
+++ b/bsps/shared/grlib/uart/apbuart_termios.c
@@ -78,7 +78,7 @@ static void apbuart_write_polled(
   size_t nwrite = 0;
 
   while (nwrite < len) {
-    apbuart_outbyte_polled(uart->regs, *buf++, 0, 0);
+    apbuart_outbyte_polled(uart->regs, *buf++, 0);
     nwrite++;
   }
 }