diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-04 15:55:52 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-07 22:15:49 +0100 |
| commit | 89a7b78c43f7550cd42a35c19c7eca9cb15ab9d1 (patch) | |
| tree | 123170fd546843febcfe3df2bc163e48ccc294b1 /arch/powerpc/cpu | |
| parent | e7e00104122af13784f0a068cbaa04c82434cea5 (diff) | |
| download | u-boot-imx-89a7b78c43f7550cd42a35c19c7eca9cb15ab9d1.zip u-boot-imx-89a7b78c43f7550cd42a35c19c7eca9cb15ab9d1.tar.gz u-boot-imx-89a7b78c43f7550cd42a35c19c7eca9cb15ab9d1.tar.bz2 | |
mpc8260/speed.c: Fix GCC 4.6 build warnings
Fix:
speed.c: In function 'get_clocks':
speed.c:113:30: warning: variable 'cpmdf' set but not used
[-Wunused-but-set-variable]
speed.c:113:23: warning: variable 'busdf' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/powerpc/cpu')
| -rw-r--r-- | arch/powerpc/cpu/mpc8260/speed.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/powerpc/cpu/mpc8260/speed.c b/arch/powerpc/cpu/mpc8260/speed.c index 0e1c2b0..bb50dee 100644 --- a/arch/powerpc/cpu/mpc8260/speed.c +++ b/arch/powerpc/cpu/mpc8260/speed.c @@ -110,7 +110,7 @@ int get_clocks (void) volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; ulong clkin; ulong sccr, dfbrg; - ulong scmr, corecnf, busdf, cpmdf, plldf, pllmf; + ulong scmr, corecnf, plldf, pllmf; corecnf_t *cp; #if !defined(CONFIG_8260_CLKIN) @@ -130,9 +130,6 @@ int get_clocks (void) corecnf = (scmr & SCMR_CORECNF_MSK) >> SCMR_CORECNF_SHIFT; cp = &corecnf_tab[corecnf]; - busdf = (scmr & SCMR_BUSDF_MSK) >> SCMR_BUSDF_SHIFT; - cpmdf = (scmr & SCMR_CPMDF_MSK) >> SCMR_CPMDF_SHIFT; - /* HiP7, HiP7 Rev01, HiP7 RevA */ if ((get_pvr () == PVR_8260_HIP7) || (get_pvr () == PVR_8260_HIP7R1) || @@ -144,12 +141,6 @@ int get_clocks (void) plldf = (scmr & SCMR_PLLDF) ? 1 : 0; gd->vco_out = (clkin * 2 * (pllmf + 1)) / (plldf + 1); } -#if 0 - if (gd->vco_out / (busdf + 1) != clkin) { - /* aaarrrggghhh!!! */ - return (1); - } -#endif gd->cpm_clk = gd->vco_out / 2; gd->bus_clk = clkin; |