summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-01-31 22:03:15 +0100
committerWolfgang Denk <wd@denx.de>2010-02-03 20:01:05 +0100
commit9461a939cabd606d7f0e9b8490b40841af104ff5 (patch)
tree8ae3a55cd54c23781444caf6813482865b52bb65
parent13d8bfe26c0dd2c08b76c5f077e800a718859bbc (diff)
downloadu-boot-imx-9461a939cabd606d7f0e9b8490b40841af104ff5.zip
u-boot-imx-9461a939cabd606d7f0e9b8490b40841af104ff5.tar.gz
u-boot-imx-9461a939cabd606d7f0e9b8490b40841af104ff5.tar.bz2
mpc5xxx/cpu_init.c: fix warning: unused variable 'cdm'
Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
-rw-r--r--cpu/mpc5xxx/cpu_init.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/cpu/mpc5xxx/cpu_init.c b/cpu/mpc5xxx/cpu_init.c
index 2aa6e1c..560c9b3 100644
--- a/cpu/mpc5xxx/cpu_init.c
+++ b/cpu/mpc5xxx/cpu_init.c
@@ -40,12 +40,14 @@ void cpu_init_f (void)
(struct mpc5xxx_mmap_ctl *) CONFIG_SYS_MBAR;
volatile struct mpc5xxx_lpb *lpb =
(struct mpc5xxx_lpb *) MPC5XXX_LPB;
- volatile struct mpc5xxx_cdm *cdm =
- (struct mpc5xxx_cdm *) MPC5XXX_CDM;
volatile struct mpc5xxx_gpio *gpio =
(struct mpc5xxx_gpio *) MPC5XXX_GPIO;
volatile struct mpc5xxx_xlb *xlb =
(struct mpc5xxx_xlb *) MPC5XXX_XLBARB;
+#if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK)
+ volatile struct mpc5xxx_cdm *cdm =
+ (struct mpc5xxx_cdm *) MPC5XXX_CDM;
+#endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */
#if defined(CONFIG_WATCHDOG)
volatile struct mpc5xxx_gpt *gpt0 =
(struct mpc5xxx_gpt *) MPC5XXX_GPT;
@@ -187,11 +189,11 @@ void cpu_init_f (void)
# if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK)
/* Motorola reports IPB should better run at 133 MHz. */
-#if defined(CONFIG_MGT5100)
+# if defined(CONFIG_MGT5100)
setbits_be32(&mm->addecr, 1);
-#elif defined(CONFIG_MPC5200)
+# elif defined(CONFIG_MPC5200)
setbits_be32(&mm->ipbi_ws_ctrl, 1);
-#endif
+# endif
/* pci_clk_sel = 0x02, ipb_clk_sel = 0x00; */
addecr = in_be32(&cdm->cfg);
addecr &= ~0x103;