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

diff --cc cpu/ppc4xx/44x_spd_ddr2.c
index 3ab050f9f735e872865a9efef985a8e0a7ae8a4c,c4da739607cc6154d1a323f4263e5d203be4fe2c..83c991116f81a843f6eb4ea214ed06ab194221c6
--- 1/cpu/ppc4xx/44x_spd_ddr2.c
--- 2/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,

diff --cc cpu/ppc4xx/start.S
Simple merge

diff --cc include/ppc440.h
Simple merge