diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
| commit | 3b93020d74630f0574cbd26d200a82c00dd11eaa (patch) | |
| tree | fdf53ce4da01d337ceb71cadf496a9fc8d2fb62c /cpu/mpc83xx/spd_sdram.c | |
| parent | c83d7ca4dadd44ae430235077f63b64a11f36f6e (diff) | |
| parent | 6007f3251c0967adc13f2ed8be1b924ddc30124d (diff) | |
| download | olio-uboot-2014.01-3b93020d74630f0574cbd26d200a82c00dd11eaa.tar.xz olio-uboot-2014.01-3b93020d74630f0574cbd26d200a82c00dd11eaa.zip | |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'cpu/mpc83xx/spd_sdram.c')
| -rw-r--r-- | cpu/mpc83xx/spd_sdram.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpu/mpc83xx/spd_sdram.c b/cpu/mpc83xx/spd_sdram.c index ee2d0385e..29dd47078 100644 --- a/cpu/mpc83xx/spd_sdram.c +++ b/cpu/mpc83xx/spd_sdram.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2006 Freescale Semiconductor, Inc. + * (C) Copyright 2006-2007 Freescale Semiconductor, Inc. * * (C) Copyright 2006 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -198,6 +198,7 @@ long int spd_sdram() if(spd.mem_type == SPD_MEMTYPE_DDR2) { immap->sysconf.ddrcdr = CFG_DDRCDR_VALUE; } + udelay(50000); #endif /* @@ -576,7 +577,7 @@ long int spd_sdram() if (effective_data_rate == 266 || effective_data_rate == 333) { cpo = 0x7; /* READ_LAT + 5/4 */ } else if (effective_data_rate == 400) { - cpo = 0x9; /* READ_LAT + 7/4 */ + cpo = 0x7; /* READ_LAT + 5/4 */ } else { /* Automatic calibration */ cpo = 0x1f; @@ -705,9 +706,11 @@ long int spd_sdram() * SDRAM Cfg 2 */ odt_cfg = 0; +#ifndef CONFIG_NEVER_ASSERT_ODT_TO_CPU if (odt_rd_cfg | odt_wr_cfg) { odt_cfg = 0x2; /* ODT to IOs during reads */ } +#endif if (spd.mem_type == SPD_MEMTYPE_DDR2) { ddr->sdram_cfg2 = (0 | (0 << 26) /* True DQS */ |