diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-11-18 16:36:27 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-11-18 16:36:27 +0100 |
| commit | 409ecdc0bb47dd28b0af6c25ffd658d22cc36b37 (patch) | |
| tree | 3216a241047e1e3edf63aa56f6f28bd3c1542f84 /cpu/mpc86xx | |
| parent | 079c2c4fa71c0d1ebef394508df9088df8a308d3 (diff) | |
| download | blackbird-obmc-uboot-409ecdc0bb47dd28b0af6c25ffd658d22cc36b37.tar.gz blackbird-obmc-uboot-409ecdc0bb47dd28b0af6c25ffd658d22cc36b37.zip | |
Fix compiler warnings for PPC systems. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu/mpc86xx')
| -rw-r--r-- | cpu/mpc86xx/spd_sdram.c | 4 | ||||
| -rw-r--r-- | cpu/mpc86xx/speed.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cpu/mpc86xx/spd_sdram.c b/cpu/mpc86xx/spd_sdram.c index d57bcdf2c8..265e033fb3 100644 --- a/cpu/mpc86xx/spd_sdram.c +++ b/cpu/mpc86xx/spd_sdram.c @@ -1114,8 +1114,10 @@ spd_sdram(void) int memsize_ddr1 = 0; unsigned int law_size_ddr1; volatile immap_t *immap = (immap_t *)CFG_IMMR; - volatile ccsr_ddr_t *ddr1 = &immap->im_ddr1; volatile ccsr_local_mcm_t *mcm = &immap->im_local_mcm; +#ifdef CONFIG_DDR_INTERLEAVE + volatile ccsr_ddr_t *ddr1 = &immap->im_ddr1; +#endif #if (CONFIG_NUM_DDR_CONTROLLERS > 1) int memsize_ddr2_dimm1 = 0; diff --git a/cpu/mpc86xx/speed.c b/cpu/mpc86xx/speed.c index 23161ca8cb..4f7e8f17dc 100644 --- a/cpu/mpc86xx/speed.c +++ b/cpu/mpc86xx/speed.c @@ -31,6 +31,9 @@ DECLARE_GLOBAL_DATA_PTR; +/* used in some defintiions of CONFIG_SYS_CLK_FREQ */ +extern unsigned long get_board_sys_clk(unsigned long dummy); + void get_sys_info(sys_info_t *sysInfo) { volatile immap_t *immap = (immap_t *) CFG_IMMR; |
