diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-10 22:04:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-10 22:04:04 +0100 |
| commit | 3c92217732edfc0016c3cbdc828471d013d23a36 (patch) | |
| tree | f695fd402c8cd78b0d5f1e66a0e2ca17c7f7d146 /cpu | |
| parent | b5a15c90a6f1230723c4e887a707d9c41ac3f4e2 (diff) | |
| parent | 0452352df118bc9dd684a056aaaa5fb4aed1178a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc85xx/ddr-gen3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc85xx/ddr-gen3.c b/cpu/mpc85xx/ddr-gen3.c index 8dc2b3ac52..99c325a4ff 100644 --- a/cpu/mpc85xx/ddr-gen3.c +++ b/cpu/mpc85xx/ddr-gen3.c @@ -79,8 +79,8 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, out_be32(&ddr->ddr_sdram_rcw_1, regs->ddr_sdram_rcw_1); out_be32(&ddr->ddr_sdram_rcw_2, regs->ddr_sdram_rcw_2); - /* Do not enable the memory */ - temp_sdram_cfg = in_be32(&ddr->sdram_cfg); + /* Set, but do not enable the memory */ + temp_sdram_cfg = regs->ddr_sdram_cfg; temp_sdram_cfg &= ~(SDRAM_CFG_MEM_EN); out_be32(&ddr->sdram_cfg, temp_sdram_cfg); /* |