mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
Merge branch 'master' of /home/wd/git/u-boot/custodians
This commit is contained in:
commit
6409b13d65
2 changed files with 2 additions and 2 deletions
|
@ -426,7 +426,7 @@ phys_size_t initdram(int board_type)
|
|||
unsigned char spd0[MAX_SPD_BYTES];
|
||||
unsigned char spd1[MAX_SPD_BYTES];
|
||||
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 val;
|
||||
ddr_cas_id_t selected_cas = DDR_CAS_5; /* preset to silence compiler */
|
||||
|
|
|
@ -196,7 +196,7 @@ static char *bootstrap_str[] = {
|
|||
"I2C (Addr 0x54)", /* A8 */
|
||||
"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
|
||||
|
||||
#if defined(CONFIG_460SX)
|
||||
|
|
Loading…
Reference in a new issue