diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-01-21 22:27:59 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-01-21 22:27:59 +0100 |
| commit | 6409b13d65d5306eaae777ac5d0d77824313ed88 (patch) | |
| tree | 763d1fb22b483363709a69728c968e8b0b39de4f | |
| parent | a16028da63c78001823bfb375b3f6d9d86e5a534 (diff) | |
| parent | 4ac63017c3147c593332a5c12d9e829be2d0d4f3 (diff) | |
| download | u-boot-imx-6409b13d65d5306eaae777ac5d0d77824313ed88.zip u-boot-imx-6409b13d65d5306eaae777ac5d0d77824313ed88.tar.gz u-boot-imx-6409b13d65d5306eaae777ac5d0d77824313ed88.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
| -rw-r--r-- | cpu/ppc4xx/44x_spd_ddr2.c | 2 | ||||
| -rw-r--r-- | cpu/ppc4xx/cpu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/cpu/ppc4xx/44x_spd_ddr2.c index f8aa14a..593a286 100644 --- a/cpu/ppc4xx/44x_spd_ddr2.c +++ b/cpu/ppc4xx/44x_spd_ddr2.c @@ -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 */ diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 73d4d06..e1a023b 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -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) |