diff options
| author | Tom Rini <trini@ti.com> | 2014-02-25 12:44:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-25 13:55:49 -0500 |
| commit | a7e8c15f71456d55ccb27f843862af03a00e0957 (patch) | |
| tree | 67028131161fdded15fd8625aabf3de03cc98b00 /arch/powerpc/cpu/mpc85xx/speed.c | |
| parent | 4c48cfb58b66924c52cd5c5d960e04cf6d7064ca (diff) | |
| parent | 91d7746df89f858548fe535137b4b185a6a76d59 (diff) | |
| download | u-boot-imx-a7e8c15f71456d55ccb27f843862af03a00e0957.zip u-boot-imx-a7e8c15f71456d55ccb27f843862af03a00e0957.tar.gz u-boot-imx-a7e8c15f71456d55ccb27f843862af03a00e0957.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
With this, fixup a trivial build error of get_effective_memsize needing
to be updated in the new board/freescale/p1010rdb/spl.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/speed.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/speed.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 35867df..adf09ef 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -151,7 +151,8 @@ void get_sys_info(sys_info_t *sys_info) sys_info->freq_processor[cpu] = freq_c_pll[cplx_pll] / core_cplx_pll_div[c_pll_sel]; } -#if defined(CONFIG_PPC_B4860) || defined(CONFIG_PPC_T2080) +#if defined(CONFIG_PPC_B4860) || defined(CONFIG_PPC_T2080) || \ + defined(CONFIG_PPC_T2081) #define FM1_CLK_SEL 0xe0000000 #define FM1_CLK_SHIFT 29 #else |