rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / cpu / mpc5xx / serial.c

diff --git a/cpu/mpc5xx/serial.c b/cpu/mpc5xx/serial.c
index 48687829e5aaa067e21115f84914c51bd6992c7a..88c6db81cb255c238f05b7f31de6d04e2c75e575 100644 (file)
--- a/cpu/mpc5xx/serial.c
+++ b/cpu/mpc5xx/serial.c
@@ -24,8 +24,8 @@
  * File:               serial.c
  *
  * Discription:                Serial interface driver for SCI1 and SCI2.
- *                             Since this code will be called from ROM use
- *                     only non-static local variables.
+ *                     Since this code will be called from ROM use
+ *                     only non-static local variables.
  *
  */
 
@@ -34,6 +34,7 @@
 #include <command.h>
 #include <mpc5xx.h>
 
+DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * Local function prototypes
@@ -47,7 +48,7 @@ static int ready_to_send(void);
 
 int serial_init (void)
 {
-       volatile immap_t *immr = (immap_t *)CFG_IMMR;
+       volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
 
        serial_setbrg();
 
@@ -64,7 +65,7 @@ int serial_init (void)
 
 void serial_putc(const char c)
 {
-       volatile immap_t *immr = (immap_t *)CFG_IMMR;
+       volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
 
        /* Test for completition */
        if(ready_to_send()) {
@@ -86,7 +87,7 @@ void serial_putc(const char c)
 
 int serial_getc(void)
 {
-       volatile immap_t *immr = (immap_t *)CFG_IMMR;
+       volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
        volatile short status;
        unsigned char tmp;
 
@@ -114,7 +115,7 @@ int serial_getc(void)
 
 int serial_tstc()
 {
-       volatile immap_t *immr = (immap_t *)CFG_IMMR;
+       volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
        short status;
 
        /* New data character ? */
@@ -128,8 +129,7 @@ int serial_tstc()
 
 void serial_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-       volatile immap_t *immr = (immap_t *)CFG_IMMR;
+       volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
        short scxbr;
 
        /* Set baudrate */
@@ -151,7 +151,7 @@ void serial_puts (const char *s)
 
 int ready_to_send(void)
 {
-       volatile immap_t *immr = (immap_t *)CFG_IMMR;
+       volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
        volatile short status;
 
        do {