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

[u-boot] / board / esd / pmc440 / sdram.c

diff --git a/board/esd/pmc440/sdram.c b/board/esd/pmc440/sdram.c
index 7f92d37727e8d07c32adbcb36ec6c1d8ad66eb32..bb46ecce2e6d6ee43a92c8bcf3890a0afcd7814b 100644 (file)
--- a/board/esd/pmc440/sdram.c
+++ b/board/esd/pmc440/sdram.c
@@ -50,7 +50,7 @@ extern void denali_core_search_data_eye(void);
  * initdram -- 440EPx's DDR controller is a DENALI Core
  *
  ************************************************************************/
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
 #if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
 #if !defined(CONFIG_NAND_SPL)
@@ -70,7 +70,7 @@ long int initdram (int board_type)
        mtsdram(DDR0_07, 0x000D0100);
        mtsdram(DDR0_08, 0x02430001);
        mtsdram(DDR0_09, 0x00011D5F);
-       mtsdram(DDR0_10, 0x00000300);
+       mtsdram(DDR0_10, 0x00000100);
        mtsdram(DDR0_11, 0x0027C800);
        mtsdram(DDR0_12, 0x00000003);
        mtsdram(DDR0_14, 0x00000000);
@@ -104,5 +104,12 @@ long int initdram (int board_type)
        denali_core_search_data_eye();
 #endif
 
-       return (CFG_MBYTES_SDRAM << 20);
+       /*
+        * Clear possible errors resulting from data-eye-search.
+        * If not done, then we could get an interrupt later on when
+        * exceptions are enabled.
+        */
+       set_mcsr(get_mcsr());
+
+       return (CONFIG_SYS_MBYTES_SDRAM << 20);
 }