diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-09 11:27:02 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-09 11:27:02 +0100 |
| commit | 0b4f57923024ccbdaa4436d6bcc958307dd597bd (patch) | |
| tree | 04525dae88a9ec015752725468b46c577ad4939d /cpu/mpc83xx/spd_sdram.c | |
| parent | c1d16334091653de8eabcc9eb4f3447c98ba5506 (diff) | |
| parent | 6775c68683a53c7abc778774641aac6f833a2cbf (diff) | |
| download | u-boot-imx-0b4f57923024ccbdaa4436d6bcc958307dd597bd.zip u-boot-imx-0b4f57923024ccbdaa4436d6bcc958307dd597bd.tar.gz u-boot-imx-0b4f57923024ccbdaa4436d6bcc958307dd597bd.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
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 ee2d038..29dd470 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 */ |