diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-11-20 14:34:57 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-11-20 14:34:57 -0600 |
| commit | 890e9413c0af74a3d74f37d9ab6d19784990fa0c (patch) | |
| tree | 0e802d5d143e09751f85c76bf02f94aca023d077 /cpu/mpc86xx | |
| parent | 1d8a49eca1c7bdc8db1c47a92f9014a29ead03ae (diff) | |
| parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
| download | blackbird-obmc-uboot-890e9413c0af74a3d74f37d9ab6d19784990fa0c.tar.gz blackbird-obmc-uboot-890e9413c0af74a3d74f37d9ab6d19784990fa0c.zip | |
Merge commit 'remotes/wd/master'
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; |
