Merge with /home/hs/U-Boot/u-boot-dev

[u-boot] / board / purple / purple.c

diff --git a/board/purple/purple.c b/board/purple/purple.c
index 293cc560e1904bf8ef7f5734ec4af7cd99c1995d..4c3e5b44b5303ed161d30fe90a885658e5755f2d 100644 (file)
--- a/board/purple/purple.c
+++ b/board/purple/purple.c
@@ -35,7 +35,7 @@
        __asm__ __volatile__("                  \
                .set noreorder;                 \
                .set mips3;                     \
-                cache %1, (%0);                        \
+               cache %1, (%0);                 \
                .set mips0;                     \
                .set reorder"                   \
                :                               \
@@ -51,6 +51,69 @@ extern int   asc_serial_getc         (void);
 extern int     asc_serial_tstc         (void);
 extern void    asc_serial_setbrg       (void);
 
+static void sdram_timing_init (ulong size)
+{
+       register uint pass;
+       register uint done;
+       register uint count;
+       register uint p0, p1, p2, p3, p4;
+       register uint addr;
+
+#define WRITE_MC_IOGP_1 *(uint *)0xbf800800 = (p1<<14)+(p2<<13)+(p4<<8)+(p0<<4)+p3;
+#define WRITE_MC_IOGP_2 *(uint *)0xbf800800 = (p1<<14)+(p2<<13)+((p4-16)<<8)+(p0<<4)+p3;
+
+       done = 0;
+       p0 = 2;
+       while (p0 < 4 && done == 0) {
+           p1 = 0;
+           while (p1 < 2 && done == 0) {
+               p2 = 0;
+               while (p2 < 2 && done == 0) {
+                   p3 = 0;
+                   while (p3 < 16 && done == 0) {
+                       count = 0;
+                       p4 = 0;
+                       while (p4 < 32 && done == 0) {
+                           WRITE_MC_IOGP_1;
+
+                           for (addr = KSEG1 + 0x4000;
+                                addr < KSEG1ADDR (size);
+                                addr = addr + 4) {
+                                       *(uint *) addr = 0xaa55aa55;
+                           }
+
+                           pass = 1;
+
+                           for (addr = KSEG1 + 0x4000;
+                                addr < KSEG1ADDR (size) && pass == 1;
+                                addr = addr + 4) {
+                                       if (*(uint *) addr != 0xaa55aa55)
+                                               pass = 0;
+                           }
+
+                           if (pass == 1) {
+                               count++;
+                           } else {
+                               count = 0;
+                           }
+
+                           if (count == 32) {
+                               WRITE_MC_IOGP_2;
+                               done = 1;
+                           }
+                           p4++;
+                       }
+                       p3++;
+                   }
+                   p2++;
+               }
+               p1++;
+           }
+           p0++;
+           if (p0 == 1)
+               p0++;
+       }
+}
 
 long int initdram(int board_type)
 {
@@ -64,6 +127,11 @@ long int initdram(int board_type)
        int     rows    = (cfgpb0 & 0xF0) >> 4;
        int     dw      = cfgdw & 0xF;
        ulong   size    = (1 << (rows + cols)) * (1 << (dw - 1)) * CFG_NB;
+       void (*  sdram_init) (ulong);
+
+       sdram_init = (void (*)(ulong)) KSEG0ADDR(&sdram_timing_init);
+
+       sdram_init(0x10000);
 
        return size;
 }
@@ -114,7 +182,7 @@ static void copydwords (ulong *source, ulong *destination, ulong nlongs)
                *(ulong *)0xbf0081f8 = temp1 + temp;
                *destination++ = temp;
 
-       } 
+       }
 }
 
 /*******************************************************************************
@@ -146,8 +214,8 @@ static void programLoad(void)
        src = (ulong *)(TEXT_BASE + 0x428);
        dst = (ulong *)0xbf0081d0;
 
-       absEntry = (FUNCPTR)(TEXT_BASE + 0x400);   
-       absEntry(src,dst,0x6);          
+       absEntry = (FUNCPTR)(TEXT_BASE + 0x400);
+       absEntry(src,dst,0x6);
 
        src = (ulong *)((ulong)copydwords & 0xfffffff8);
        dst = (ulong *)0xbf008000;
@@ -164,6 +232,7 @@ static void programLoad(void)
 */
 void copy_code (ulong dest_addr)
 {
+       extern long uboot_end_data;
        unsigned long start;
        unsigned long end;
 
@@ -175,7 +244,7 @@ void copy_code (ulong dest_addr)
         */
        copyLongs((ulong *)CFG_MONITOR_BASE,
                  (ulong *)dest_addr,
-                 (CFG_MONITOR_LEN + 3) / 4);
+                 ((ulong)&uboot_end_data - CFG_MONITOR_BASE + 3) / 4);
 
 
        /* flush caches