GCC-4.x fixes: clean up global data pointer initialization for all boards.

[karo-tx-uboot.git] / cpu / mpc8220 / cpu_init.c

diff --git a/cpu/mpc8220/cpu_init.c b/cpu/mpc8220/cpu_init.c
index a1e2f659cfb650c0900742636de05dd59ed4a00f..3cf5f66a13006554524e95601569d557489a8803 100644 (file)
--- a/cpu/mpc8220/cpu_init.c
+++ b/cpu/mpc8220/cpu_init.c
@@ -24,6 +24,8 @@
 #include <common.h>
 #include <mpc8220.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /*
  * Breath some life into the CPU...
  *
@@ -32,8 +34,6 @@
  */
 void cpu_init_f (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        volatile flexbus8220_t *flexbus = (volatile flexbus8220_t *) MMAP_FB;
        volatile pcfg8220_t *portcfg = (volatile pcfg8220_t *) MMAP_PCFG;
        volatile xlbarb8220_t *xlbarb = (volatile xlbarb8220_t *) MMAP_XLBARB;
@@ -49,6 +49,8 @@ void cpu_init_f (void)
        portcfg->pcfg1 = 0;
        portcfg->pcfg2 = 0;
        portcfg->pcfg3 = 0;
+       portcfg->pcfg2 = CFG_GP1_PORT2_CONFIG;
+       portcfg->pcfg3 = CFG_PCI_PORT3_CONFIG | CFG_GP2_PORT3_CONFIG;
 
        /*
         * Flexbus Controller: configure chip selects and enable them
@@ -109,7 +111,7 @@ void cpu_init_f (void)
 
        /* Master Priority Enable */
        xlbarb->mastPriority = 0;
-       xlbarb->mastPriEn = 0x1f;
+       xlbarb->mastPriEn = 0xff;
 }
 
 /*