Hi Wolfgang, > Signed-off-by: Wolfgang Denk <w...@denx.de>
Acked-by: Detlev Zundel <d...@denx.de> By the way, now that we have a patch touching this stuff on the mailing list - would anyone object to removing the mgt5100 stuff? If I am not missing anything, this is not being used anywhere and makes the code look overly complicated. Would such a cleanup patch be accepted? Thanks Detlev > --- > cpu/mpc5xxx/cpu_init.c | 12 +++++++----- > 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; -- Question : If you were redesigning UNIX, what would you do differently? Ken Thompson: I'd spell creat with an e. -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot