X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=cpu%2Fnios%2Fserial.c;h=44aa6001f599049db8e8979f483fae4c732e2128;hb=4b99327a4121a28d2bdb2c2b841f5d97931ae905;hp=5ecdc6d7ea128ef8e831d8032656518d559496d2;hpb=d87080b721e4f8dca977af7571c5338ae7bb8db7;p=u-boot

diff --git a/cpu/nios/serial.c b/cpu/nios/serial.c
index 5ecdc6d7ea..44aa6001f5 100644
--- a/cpu/nios/serial.c
+++ b/cpu/nios/serial.c
@@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;
  *-----------------------------------------------------------------*/
 #if defined(CONFIG_CONSOLE_JTAG)
 
-static nios_jtag_t *jtag = (nios_jtag_t *)CFG_NIOS_CONSOLE;
+static nios_jtag_t *jtag = (nios_jtag_t *)CONFIG_SYS_NIOS_CONSOLE;
 
 void serial_setbrg( void ){ return; }
 int serial_init( void ) { return(0);}
@@ -71,9 +71,9 @@ int serial_getc (void)
  *-----------------------------------------------------------------*/
 #else
 
-static nios_uart_t *uart = (nios_uart_t *)CFG_NIOS_CONSOLE;
+static nios_uart_t *uart = (nios_uart_t *)CONFIG_SYS_NIOS_CONSOLE;
 
-#if defined(CFG_NIOS_FIXEDBAUD)
+#if defined(CONFIG_SYS_NIOS_FIXEDBAUD)
 
 /* Everything's already setup for fixed-baud PTF
  * assignment
@@ -98,7 +98,7 @@ int serial_init (void)
 	return (0);
 }
 
-#endif /* CFG_NIOS_FIXEDBAUD */
+#endif /* CONFIG_SYS_NIOS_FIXEDBAUD */
 
 
 /*-----------------------------------------------------------------------