]> git.sur5r.net Git - u-boot/commitdiff
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
authorWolfgang Denk <wd@pollux.denx.de>
Thu, 8 Mar 2007 10:38:58 +0000 (11:38 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 8 Mar 2007 10:38:58 +0000 (11:38 +0100)
1  2 
cpu/ppc4xx/44x_spd_ddr2.c
cpu/ppc4xx/start.S
include/ppc440.h

index 3ab050f9f735e872865a9efef985a8e0a7ae8a4c,c4da739607cc6154d1a323f4263e5d203be4fe2c..83c991116f81a843f6eb4ea214ed06ab194221c6
@@@ -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,
Simple merge
Simple merge