diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-24 20:34:29 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-24 20:34:29 +0200 |
| commit | 07c9cd81170335307a3090add3cd37147d29482e (patch) | |
| tree | e5e98dc33dc17399ad16d85d6df1c36d44e22889 /arch/powerpc/cpu/ppc4xx/ecc.c | |
| parent | 8024ac7a61f235b5444eac1ce0271d86e05d04de (diff) | |
| parent | 96623171423a94092cde80642328fda58a92c894 (diff) | |
| download | u-boot-imx-07c9cd81170335307a3090add3cd37147d29482e.zip u-boot-imx-07c9cd81170335307a3090add3cd37147d29482e.tar.gz u-boot-imx-07c9cd81170335307a3090add3cd37147d29482e.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'arch/powerpc/cpu/ppc4xx/ecc.c')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/ecc.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/ecc.c b/arch/powerpc/cpu/ppc4xx/ecc.c index f105605..49f28d9 100644 --- a/arch/powerpc/cpu/ppc4xx/ecc.c +++ b/arch/powerpc/cpu/ppc4xx/ecc.c @@ -130,7 +130,26 @@ static void program_ecc_addr(unsigned long start_address, /* clear ECC error repoting registers */ mtsdram(SDRAM_ECCES, 0xffffffff); - mtdcr(0x4c, 0xffffffff); +#if defined(CONFIG_SDRAM_PPC4xx_IBM_DDR) + /* + * IBM DDR(1) core (440GX): + * Clear Mx bits in SDRAM0_BESR0/1 + */ + mtsdram(SDRAM0_BESR0, 0xffffffff); + mtsdram(SDRAM0_BESR1, 0xffffffff); +#elif defined(CONFIG_440) + /* + * 440/460 DDR2 core: + * Clear EMID (Error PLB Master ID) in MQ0_ESL + */ + mtdcr(SDRAM_ERRSTATLL, 0xfff00000); +#else + /* + * 405EX(r) DDR2 core: + * Clear M0ID (Error PLB Master ID) in SDRAM_BESR + */ + mtsdram(SDRAM_BESR, 0xf0000000); +#endif mtsdram(SDRAM_MCOPT1, (mcopt1 & ~SDRAM_MCOPT1_MCHK_MASK) | SDRAM_MCOPT1_MCHK_CHK_REP); |