#if defined(CONFIG_FSL_DDR3)
        md_en = popts->mirrored_dimm;
 #endif
+       rcw_en = popts->registered_dimm_en;
        qd_en = popts->quad_rank_present ? 1 : 0;
        ddr->ddr_sdram_cfg_2 = (0
                | ((frc_sr & 0x1) << 31)
 
                {550, 680,    1,    4,   0x1f,    3,  0},
                {681, 850,    1,    4,   0x1f,    4,  0}
 #else
-               {  0, 850,    2,    4,   0x1f,    4,  0},
+               {  0, 850,    2,    6,   0x1f,    4,  0},
                {  0, 850,    1,    4,   0x1f,    4,  0}
 #endif
        },
        /* Write leveling override */
        popts->wrlvl_override = 1;
        popts->wrlvl_sample = 0xa;
-       popts->wrlvl_start = 0x7;
+       popts->wrlvl_start = 0x8;
        /* Rtt and Rtt_WR override */
        popts->rtt_override = 1;
        popts->rtt_override_value = DDR3_RTT_120_OHM;