summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-10-03 13:28:45 +0000
committerjason <jason@jason-ThinkPad-T61.(none)>2012-10-19 23:47:41 +0800
commitc1568ca5450cc20eb0f15246656724a1df9699c3 (patch)
tree64b51de37321d47dbc012c174b5e48a5c22e80bc /arch
parent2b05593da61555b091ee1640dc6c4fcb235771e9 (diff)
downloadu-boot-imx-c1568ca5450cc20eb0f15246656724a1df9699c3.zip
u-boot-imx-c1568ca5450cc20eb0f15246656724a1df9699c3.tar.gz
u-boot-imx-c1568ca5450cc20eb0f15246656724a1df9699c3.tar.bz2
m68k: Fix unused variable warning in speed.c
The following warning was produced, fix it: speed.c: In function 'get_clocks': speed.c:94:15: warning: variable 'bPci' set but not used [-Wunused-but-set-variable] Signed-off-by: Marek Vasut <marex@denx.de> Cc: "Jin Zhengxiong-R64188" <R64188@freescale.com> Cc: Jason Jin <jason.jin@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/cpu/mcf5445x/speed.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c
index 073b7ef..d71b5fe 100644
--- a/arch/m68k/cpu/mcf5445x/speed.c
+++ b/arch/m68k/cpu/mcf5445x/speed.c
@@ -91,9 +91,12 @@ int get_clocks(void)
pll_t *pll = (pll_t *)MMAP_PLL;
int pllmult_nopci[] = { 20, 10, 24, 18, 12, 6, 16, 8 };
int pllmult_pci[] = { 12, 6, 16, 8 };
- int vco = 0, bPci, temp, fbtemp, pcrvalue;
+ int vco = 0, temp, fbtemp, pcrvalue;
int *pPllmult = NULL;
u16 fbpll_mask;
+#ifdef CONFIG_PCI
+ int bPci;
+#endif
#ifdef CONFIG_M54455EVB
u8 *cpld = (u8 *)(CONFIG_SYS_CS2_BASE + 3);
@@ -105,14 +108,16 @@ int get_clocks(void)
((in_be16(&ccm->ccr) & CCM_CCR_360_FBCONFIG_MASK) == 0x0060)) {
pPllmult = &pllmult_pci[0];
fbpll_mask = 3; /* 11b */
+#ifdef CONFIG_PCI
bPci = 1;
+#endif
} else {
pPllmult = &pllmult_nopci[0];
fbpll_mask = 7; /* 111b */
#ifdef CONFIG_PCI
gd->pci_clk = 0;
-#endif
bPci = 0;
+#endif
}
#ifdef CONFIG_M54455EVB