projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mpc83xx: USB: Reorganized its support
[oweals/u-boot.git]
/
cpu
/
nios
/
serial.c
diff --git
a/cpu/nios/serial.c
b/cpu/nios/serial.c
index 5ecdc6d7ea128ef8e831d8032656518d559496d2..44aa6001f599049db8e8979f483fae4c732e2128 100644
(file)
--- a/
cpu/nios/serial.c
+++ b/
cpu/nios/serial.c
@@
-33,7
+33,7
@@
DECLARE_GLOBAL_DATA_PTR;
*-----------------------------------------------------------------*/
#if defined(CONFIG_CONSOLE_JTAG)
*-----------------------------------------------------------------*/
#if defined(CONFIG_CONSOLE_JTAG)
-static nios_jtag_t *jtag = (nios_jtag_t *)C
FG
_NIOS_CONSOLE;
+static nios_jtag_t *jtag = (nios_jtag_t *)C
ONFIG_SYS
_NIOS_CONSOLE;
void serial_setbrg( void ){ return; }
int serial_init( void ) { return(0);}
void serial_setbrg( void ){ return; }
int serial_init( void ) { return(0);}
@@
-71,9
+71,9
@@
int serial_getc (void)
*-----------------------------------------------------------------*/
#else
*-----------------------------------------------------------------*/
#else
-static nios_uart_t *uart = (nios_uart_t *)C
FG
_NIOS_CONSOLE;
+static nios_uart_t *uart = (nios_uart_t *)C
ONFIG_SYS
_NIOS_CONSOLE;
-#if defined(C
FG
_NIOS_FIXEDBAUD)
+#if defined(C
ONFIG_SYS
_NIOS_FIXEDBAUD)
/* Everything's already setup for fixed-baud PTF
* assignment
/* Everything's already setup for fixed-baud PTF
* assignment
@@
-98,7
+98,7
@@
int serial_init (void)
return (0);
}
return (0);
}
-#endif /* C
FG
_NIOS_FIXEDBAUD */
+#endif /* C
ONFIG_SYS
_NIOS_FIXEDBAUD */
/*-----------------------------------------------------------------------
/*-----------------------------------------------------------------------