Merging Stelian Pop AT91 patches

[oweals/u-boot.git] / board / BuS / EB+MCF-EV123 / EB+MCF-EV123.c

diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
index f18313d516118d493d65858848eaef8f2a7f1f87..dcfd83ed2792870150cddbe0c3cb5b6cce1683f6 100644 (file)
--- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
+++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
@@ -50,13 +50,13 @@ long int initdram (int board_type)
 
                MCFSDRAMC_DACR0 =       MCFSDRAMC_DACR_BASE(CFG_SDRAM_BASE0)
                                        | MCFSDRAMC_DACR_CASL(1)
-                                       | MCFSDRAMC_DACR_CBM(3)
+                                       | MCFSDRAMC_DACR_CBM(3)
                                        | MCFSDRAMC_DACR_PS_16);
 
                MCFSDRAMC_DMR0 =        MCFSDRAMC_DMR_BAM_16M
                                        | MCFSDRAMC_DMR_V;
 
-               MCFSDRAMC_DACR0 |=      MCFSDRAMC_DACR_IP;
+               MCFSDRAMC_DACR0 |=      MCFSDRAMC_DACR_IP;
 
                *(unsigned short *)(CFG_SDRAM_BASE0) = 0xA5A5;
                MCFSDRAMC_DACR0 |=      MCFSDRAMC_DACR_RE;
@@ -70,10 +70,10 @@ long int initdram (int board_type)
        #ifdef CFG_SDRAM_BASE1
                MCFSDRAMC_DACR1 =       MCFSDRAMC_DACR_BASE(CFG_SDRAM_BASE1)
                                        | MCFSDRAMC_DACR_CASL(1)
-                                       | MCFSDRAMC_DACR_CBM(3)
+                                       | MCFSDRAMC_DACR_CBM(3)
                                        | MCFSDRAMC_DACR_PS_16;
 
-               MCFSDRAMC_DMR1 =        MCFSDRAMC_DMR_BAM_16M
+               MCFSDRAMC_DMR1 =        MCFSDRAMC_DMR_BAM_16M
                                        | MCFSDRAMC_DMR_V;
 
                MCFSDRAMC_DACR1 |=      MCFSDRAMC_DACR_IP;
@@ -82,7 +82,7 @@ long int initdram (int board_type)
                MCFSDRAMC_DACR1 |=      MCFSDRAMC_DACR_RE;
                for (i=0; i < 2000; i++)
                        asm(" nop");
-               MCFSDRAMC_DACR1 |=      MCFSDRAMC_DACR_IMRS;
+               MCFSDRAMC_DACR1 |=      MCFSDRAMC_DACR_IMRS;
                *(unsigned int *)(CFG_SDRAM_BASE1 + 0x220) = 0xA5A5;
                size += CFG_SDRAM_SIZE1 * 1024 * 1024;
        #endif