V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

This commit is contained in:
Wolfgang Denk 2010-01-21 22:27:54 +01:00
parent 7114596a7d 33c8c66423
commit 4ac63017c3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/ppc4xx/44x_spd_ddr2.c
View File

@ -426,7 +426,7 @@ phys_size_t initdram(int board_type)
unsigned char spd0[MAX_SPD_BYTES]; unsigned char spd0[MAX_SPD_BYTES];
unsigned char spd1[MAX_SPD_BYTES]; unsigned char spd1[MAX_SPD_BYTES];
unsigned char *dimm_spd[MAXDIMMS]; unsigned char *dimm_spd[MAXDIMMS];
unsigned long dimm_populated[MAXDIMMS]; unsigned long dimm_populated[MAXDIMMS] = {SDRAM_NONE, SDRAM_NONE};
unsigned long num_dimm_banks; /* on board dimm banks */ unsigned long num_dimm_banks; /* on board dimm banks */
unsigned long val; unsigned long val;
ddr_cas_id_t selected_cas = DDR_CAS_5; /* preset to silence compiler */ ddr_cas_id_t selected_cas = DDR_CAS_5; /* preset to silence compiler */

2
cpu/ppc4xx/cpu.c
View File

@ -196,7 +196,7 @@ static char *bootstrap_str[] = {
"I2C (Addr 0x54)", /* A8 */ "I2C (Addr 0x54)", /* A8 */
"I2C (Addr 0x52)", /* A4 */ "I2C (Addr 0x52)", /* A4 */
}; };
static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'G', 'F', 'H' }; static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H' };
#endif #endif
#if defined(CONFIG_460SX) #if defined(CONFIG_460SX)