projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
amirix
/
ap1000
/
serial.c
diff --git
a/board/amirix/ap1000/serial.c
b/board/amirix/ap1000/serial.c
index
508e880
..
87003be
100644
(file)
--- a/
board/amirix/ap1000/serial.c
+++ b/
board/amirix/ap1000/serial.c
@@
-30,15
+30,15
@@
DECLARE_GLOBAL_DATA_PTR;
const NS16550_t COM_PORTS[] =
DECLARE_GLOBAL_DATA_PTR;
const NS16550_t COM_PORTS[] =
- { (NS16550_t) C
FG_NS16550_COM1, (NS16550_t) CFG
_NS16550_COM2 };
+ { (NS16550_t) C
ONFIG_SYS_NS16550_COM1, (NS16550_t) CONFIG_SYS
_NS16550_COM2 };
-#undef C
FG
_DUART_CHAN
-#define C
FG
_DUART_CHAN gComPort
+#undef C
ONFIG_SYS
_DUART_CHAN
+#define C
ONFIG_SYS
_DUART_CHAN gComPort
static int gComPort = 0;
int serial_init (void)
{
static int gComPort = 0;
int serial_init (void)
{
- int clock_divisor = C
FG
_NS16550_CLK / 16 / gd->baudrate;
+ int clock_divisor = C
ONFIG_SYS
_NS16550_CLK / 16 / gd->baudrate;
(void) NS16550_init (COM_PORTS[0], clock_divisor);
gComPort = 0;
(void) NS16550_init (COM_PORTS[0], clock_divisor);
gComPort = 0;
@@
-49,30
+49,30
@@
int serial_init (void)
void serial_putc (const char c)
{
if (c == '\n') {
void serial_putc (const char c)
{
if (c == '\n') {
- NS16550_putc (COM_PORTS[C
FG
_DUART_CHAN], '\r');
+ NS16550_putc (COM_PORTS[C
ONFIG_SYS
_DUART_CHAN], '\r');
}
}
- NS16550_putc (COM_PORTS[C
FG
_DUART_CHAN], c);
+ NS16550_putc (COM_PORTS[C
ONFIG_SYS
_DUART_CHAN], c);
}
int serial_getc (void)
{
}
int serial_getc (void)
{
- return NS16550_getc (COM_PORTS[C
FG
_DUART_CHAN]);
+ return NS16550_getc (COM_PORTS[C
ONFIG_SYS
_DUART_CHAN]);
}
int serial_tstc (void)
{
}
int serial_tstc (void)
{
- return NS16550_tstc (COM_PORTS[C
FG
_DUART_CHAN]);
+ return NS16550_tstc (COM_PORTS[C
ONFIG_SYS
_DUART_CHAN]);
}
void serial_setbrg (void)
{
}
void serial_setbrg (void)
{
- int clock_divisor = C
FG
_NS16550_CLK / 16 / gd->baudrate;
+ int clock_divisor = C
ONFIG_SYS
_NS16550_CLK / 16 / gd->baudrate;
-#ifdef C
FG
_INIT_CHAN1
+#ifdef C
ONFIG_SYS
_INIT_CHAN1
NS16550_reinit (COM_PORTS[0], clock_divisor);
#endif
NS16550_reinit (COM_PORTS[0], clock_divisor);
#endif
-#ifdef C
FG
_INIT_CHAN2
+#ifdef C
ONFIG_SYS
_INIT_CHAN2
NS16550_reinit (COM_PORTS[1], clock_divisor);
#endif
}
NS16550_reinit (COM_PORTS[1], clock_divisor);
#endif
}