diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 20:03:38 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 20:03:38 +0200 |
commit | b4f15fdaf77b7339e2984703c83269c7cdf680a9 (patch) | |
tree | 32bb3b65d98a229aead643ae11ef2dc433146411 /board/cds/mpc8555cds/mpc8555cds.c | |
parent | b20d00328c5486a4b2cdf07ce7afaf2139dc741e (diff) | |
parent | 07a2505f67e091ff70506ae6a5022b416211df44 (diff) |
Merge with /home/wd/git/u-boot/jon_loeliger
Diffstat (limited to 'board/cds/mpc8555cds/mpc8555cds.c')
-rw-r--r-- | board/cds/mpc8555cds/mpc8555cds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/cds/mpc8555cds/mpc8555cds.c b/board/cds/mpc8555cds/mpc8555cds.c index a40de2198b..18adf5b9e6 100644 --- a/board/cds/mpc8555cds/mpc8555cds.c +++ b/board/cds/mpc8555cds/mpc8555cds.c @@ -30,7 +30,7 @@ #include "../common/cadmus.h" #include "../common/eeprom.h" -#if defined(CONFIG_DDR_ECC) +#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) extern void ddr_enable_ecc(unsigned int dram_size); #endif @@ -269,7 +269,7 @@ initdram(int board_type) #endif dram_size = spd_sdram(); -#if defined(CONFIG_DDR_ECC) +#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) /* * Initialize and enable DDR ECC. */ |