Revert "ppc4xx: Fix DDR2 auto calibration on Kilauea 600MHz (200MHz PLB)"

This reverts commit 3eec160a3a.

Signed-off-by: Stefan Roese <sr@denx.de>
master
Stefan Roese 16 years ago
parent 3eec160a3a
commit 023824549a
  1. 31
      board/amcc/kilauea/kilauea.c
  2. 5
      cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
  3. 6
      include/asm-ppc/ppc4xx-sdram.h

@ -374,34 +374,3 @@ int post_hotkeys_pressed(void)
return 0; /* No hotkeys supported */
}
#endif /* CONFIG_POST */
#if defined(CONFIG_PPC4xx_DDR_AUTOCALIBRATION)
/*
* This is for quicker auto calibration boot up once WRDTR and CLKTR
* values for the kilauea board were determined and are therefore known.
*
* Use these scan options for PLB bus greater than or equal 200MHz
* else use the defaults. These options are known to return a cycle
* delay of T2 or better with a 200MHz PLB bus. Scanning the
* full list of WDTR/CLKTR should work, but currently it does not.
* HW team is investigating.
*/
/* List of (SDRAM_WRDTR.[WDTR], SDRAM_CLKTR.[CLKP]) pairs to try */
struct sdram_timing quick_scan_options[] = {
{0, 3}, {1, 1}, {1, 2}, {1, 3},
{2, 1}, {2, 2}, {2, 3}, {3, 1},
{3, 2}, {4, 1}, {-1, -1}
};
ulong ddr_scan_option(ulong default_val)
{
PPC4xx_SYS_INFO board_cfg;
get_sys_info(&board_cfg);
if (board_cfg.freqPLB >= 200000000)
return (ulong)(quick_scan_options);
else
return (ulong)default_val;
}
#endif /* CONFIG_PPC4xx_DDR_AUTOCALIBRATION */

@ -79,6 +79,11 @@ struct ddrautocal {
u32 flags;
};
struct sdram_timing {
u32 wrdtr;
u32 clktr;
};
struct sdram_timing_clks {
u32 wrdtr;
u32 clktr;

@ -1403,12 +1403,6 @@
#endif /* CONFIG_SDRAM_PPC4xx_DENALI_DDR2 */
#ifndef __ASSEMBLY__
struct sdram_timing {
u32 wrdtr;
u32 clktr;
};
/*
* Prototypes
*/

Loading…
Cancel
Save