Fix memory init problems on MCC200 board

[oweals/u-boot.git] / board / mcc200 / mcc200.c

diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index d1c99fdd85f00f6776b7699894bd58166bc4e662..b9b9a712b8343740b56e23274ca54da0c339bd76 100644 (file)
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -28,7 +28,13 @@
 #include <mpc5xxx.h>
 #include <pci.h>
 
-#include "mt48lc8m32b2-6-7.h"
+/* Two MT48LC8M32B2 for 32 MB */
+/* #include "mt48lc8m32b2-6-7.h" */
+
+/* One MT48LC16M32S2 for 64 MB */
+#include "mt48lc16m32s2-75.h"
+
+DECLARE_GLOBAL_DATA_PTR;
 
 extern flash_info_t flash_info[];      /* FLASH chips info */
 
@@ -72,6 +78,8 @@ static void sdram_start (int hi_addr)
        /* normal operation */
        *(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | hi_addr_bit;
        __asm__ volatile ("sync");
+
+       udelay(10);
 }
 #endif
 
@@ -190,8 +198,6 @@ int checkboard (void)
 
 int misc_init_r (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /*
         * Adjust flash start and offset to detected values
         */
@@ -238,6 +244,16 @@ int misc_init_r (void)
                               &flash_info[CFG_MAX_FLASH_BANKS - 1]);
        }
 
+       if (gd->bd->bi_flashsize > (32 << 20)) {
+               /* Unprotect the upper bank of the Flash */
+               *(volatile int*)MPC5XXX_CS0_CFG |= (1 << 6);
+               flash_protect (FLAG_PROTECT_CLEAR,
+                              flash_info[0].start[0] + flash_info[0].size / 2,
+                              (flash_info[0].start[0] + flash_info[0].size) / 2 - 1,
+                              &flash_info[0]);
+               *(volatile int*)MPC5XXX_CS0_CFG &= ~(1 << 6);
+       }
+
        return (0);
 }