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/mpc8541cds | |
| parent | b20d00328c5486a4b2cdf07ce7afaf2139dc741e (diff) | |
| parent | 07a2505f67e091ff70506ae6a5022b416211df44 (diff) | |
Merge with /home/wd/git/u-boot/jon_loeliger
Diffstat (limited to 'board/cds/mpc8541cds')
| -rw-r--r-- | board/cds/mpc8541cds/mpc8541cds.c | 4 | ||||
| -rw-r--r-- | board/cds/mpc8541cds/u-boot.lds | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/board/cds/mpc8541cds/mpc8541cds.c b/board/cds/mpc8541cds/mpc8541cds.c index c75a4dfe0f..6b8aa68f54 100644 --- a/board/cds/mpc8541cds/mpc8541cds.c +++ b/board/cds/mpc8541cds/mpc8541cds.c @@ -32,7 +32,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 @@ -271,7 +271,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. */ diff --git a/board/cds/mpc8541cds/u-boot.lds b/board/cds/mpc8541cds/u-boot.lds index f8cee53eeb..bd697d8d0c 100644 --- a/board/cds/mpc8541cds/u-boot.lds +++ b/board/cds/mpc8541cds/u-boot.lds @@ -69,7 +69,6 @@ SECTIONS cpu/mpc85xx/interrupts.o (.text) cpu/mpc85xx/cpu_init.o (.text) cpu/mpc85xx/cpu.o (.text) - cpu/mpc85xx/tsec.o (.text) cpu/mpc85xx/speed.o (.text) cpu/mpc85xx/pci.o (.text) common/dlmalloc.o (.text) |