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

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

diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index b3dd9c86578a7fc50ed273e4a3e668375cd6036f..c724effa06357f43137eea9cabeb8201e4c45901 100644 (file)
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -57,7 +57,7 @@ int checkboard (void)
        return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        long dram_size = 0;
 
@@ -135,7 +135,7 @@ long int fixed_sdram (void)
        ddr->cs1_config = CFG_DDR_CS1_CONFIG;
        ddr->cs2_config = CFG_DDR_CS2_CONFIG;
        ddr->cs3_config = CFG_DDR_CS3_CONFIG;
-       ddr->ext_refrec = CFG_DDR_EXT_REFRESH;
+       ddr->timing_cfg_3 = CFG_DDR_TIMING_3;
        ddr->timing_cfg_0 = CFG_DDR_TIMING_0;
        ddr->timing_cfg_1 = CFG_DDR_TIMING_1;
        ddr->timing_cfg_2 = CFG_DDR_TIMING_2;
@@ -166,7 +166,7 @@ long int fixed_sdram (void)
        ddr->cs1_config = CFG_DDR2_CS1_CONFIG;
        ddr->cs2_config = CFG_DDR2_CS2_CONFIG;
        ddr->cs3_config = CFG_DDR2_CS3_CONFIG;
-       ddr->ext_refrec = CFG_DDR2_EXT_REFRESH;
+       ddr->timing_cfg_3 = CFG_DDR2_EXT_REFRESH;
        ddr->timing_cfg_0 = CFG_DDR2_TIMING_0;
        ddr->timing_cfg_1 = CFG_DDR2_TIMING_1;
        ddr->timing_cfg_2 = CFG_DDR2_TIMING_2;