Merge with git://www.denx.de/git/u-boot.git

diff --combined cpu/ppc4xx/44x_spd_ddr.c
index 0b0c55a44fe6a8f5691537ef0001b494983448f4,6d6fba1802dffec8e61c5d46fee2ffba4874e145..e5f296eb0688361f165e9d29ca47f0b9d2a875ed
--- 1/cpu/ppc4xx/44x_spd_ddr.c
--- 2/cpu/ppc4xx/44x_spd_ddr.c
+++ b/cpu/ppc4xx/44x_spd_ddr.c
@@@ -271,6 -271,7 +271,6 @@@ typedef struct bank_param BANKPARMS
  #ifdef CFG_SIMULATE_SPD_EEPROM
  extern unsigned char cfg_simulate_spd_eeprom[128];
  #endif
 -void program_tlb(u32 phys_addr, u32 virt_addr, u32 size, u32 tlb_word2_i_value);
  
  static unsigned char spd_read(uchar chip, uint addr);
  static void get_spd_info(unsigned long *dimm_populated,
@@@ -1016,7 -1017,7 +1016,7 @@@ static int short_mem_test(void
                         */
                        for (i = 0; i < NUMMEMTESTS; i++) {
                                for (j = 0; j < NUMMEMWORDS; j++) {
- //printf("bank enabled base:%x\n", &membase[j]);
+                                       /* printf("bank enabled base:%x\n", &membase[j]); */
                                        membase[j] = test[i][j];
                                        ppcDcbf((unsigned long)&(membase[j]));
                                }