From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 8 Mar 2007 10:38:58 +0000 (+0100)
Subject: Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
X-Git-Tag: v1.3.0-rc1~146
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35ded29fd941f3bd40660dd1440763f34708cf65;p=oweals%2Fu-boot.git

Merge ... /home/wd/git/u-boot/custodian/u-boot-ppc4xx
---

35ded29fd941f3bd40660dd1440763f34708cf65
diff --cc cpu/ppc4xx/44x_spd_ddr2.c
index 3ab050f9f7,c4da739607..83c991116f
--- a/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/cpu/ppc4xx/44x_spd_ddr2.c
@@@ -185,9 -185,10 +185,10 @@@ static void program_copt1(unsigned lon
  static void program_initplr(unsigned long *dimm_populated,
  			    unsigned char *iic0_dimm_addr,
  			    unsigned long num_dimm_banks,
 -                            ddr_cas_id_t selected_cas,
 +			    ddr_cas_id_t selected_cas,
  			    int write_recovery);
  static unsigned long is_ecc_enabled(void);
+ #ifdef CONFIG_DDR_ECC
  static void program_ecc(unsigned long *dimm_populated,
  			unsigned char *iic0_dimm_addr,
  			unsigned long num_dimm_banks,