Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[oweals/u-boot.git] / cpu / mpc8260 / serial_scc.c

diff --git a/cpu/mpc8260/serial_scc.c b/cpu/mpc8260/serial_scc.c
index ca763024fcba92961505fd96fba105a7e8219d28..4ab6a28640361dc7cda7a34859d0b79718987ae8 100644 (file)
--- a/cpu/mpc8260/serial_scc.c
+++ b/cpu/mpc8260/serial_scc.c
@@ -32,6 +32,8 @@
 #include <mpc8260.h>
 #include <asm/cpm_8260.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #if defined(CONFIG_CONS_ON_SCC)
 
 #if CONFIG_CONS_INDEX == 1     /* Console on SCC1 */
@@ -82,7 +84,7 @@
 
 int serial_init (void)
 {
-        volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile scc_t *sp;
        volatile scc_uart_t *up;
        volatile cbd_t *tbdf, *rbdf;
@@ -181,8 +183,6 @@ int serial_init (void)
 void
 serial_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
 #if defined(CONFIG_CONS_USE_EXTC)
        m8260_cpm_extcbrg(SCC_INDEX, gd->baudrate,
                CONFIG_CONS_EXTC_RATE, CONFIG_CONS_EXTC_PINSEL);
@@ -196,12 +196,12 @@ serial_putc(const char c)
 {
        volatile scc_uart_t     *up;
        volatile cbd_t          *tbdf;
-        volatile immap_t       *im;
+       volatile immap_t        *im;
 
        if (c == '\n')
                serial_putc ('\r');
 
-        im = (immap_t *)CFG_IMMR;
+       im = (immap_t *)CONFIG_SYS_IMMR;
        up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
        tbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_tbase];
 
@@ -230,10 +230,10 @@ serial_getc(void)
 {
        volatile cbd_t          *rbdf;
        volatile scc_uart_t     *up;
-        volatile immap_t       *im;
+       volatile immap_t        *im;
        unsigned char           c;
 
-        im = (immap_t *)CFG_IMMR;
+       im = (immap_t *)CONFIG_SYS_IMMR;
        up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
        rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];
 
@@ -255,9 +255,9 @@ serial_tstc()
 {
        volatile cbd_t          *rbdf;
        volatile scc_uart_t     *up;
-        volatile immap_t       *im;
+       volatile immap_t        *im;
 
-        im = (immap_t *)CFG_IMMR;
+       im = (immap_t *)CONFIG_SYS_IMMR;
        up = (scc_uart_t *)&im->im_dprambase[PROFF_SCC];
        rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];
 
@@ -321,7 +321,7 @@ serial_tstc()
 void
 kgdb_serial_init (void)
 {
-        volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile scc_t *sp;
        volatile scc_uart_t *up;
        volatile cbd_t *tbdf, *rbdf;
@@ -435,12 +435,12 @@ putDebugChar(const char c)
 {
        volatile scc_uart_t     *up;
        volatile cbd_t          *tbdf;
-        volatile immap_t       *im;
+       volatile immap_t        *im;
 
        if (c == '\n')
                putDebugChar ('\r');
 
-        im = (immap_t *)CFG_IMMR;
+       im = (immap_t *)CONFIG_SYS_IMMR;
        up = (scc_uart_t *)&im->im_dprambase[KGDB_PROFF_SCC];
        tbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_tbase];
 
@@ -469,10 +469,10 @@ getDebugChar(void)
 {
        volatile cbd_t          *rbdf;
        volatile scc_uart_t     *up;
-        volatile immap_t       *im;
+       volatile immap_t        *im;
        unsigned char           c;
 
-        im = (immap_t *)CFG_IMMR;
+       im = (immap_t *)CONFIG_SYS_IMMR;
        up = (scc_uart_t *)&im->im_dprambase[KGDB_PROFF_SCC];
        rbdf = (cbd_t *)&im->im_dprambase[up->scc_genscc.scc_rbase];