diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xxx/cpu_init.c | 12 | ||||
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/cpu/mpc5xxx/cpu_init.c b/cpu/mpc5xxx/cpu_init.c index ce562c172..3599a86fe 100644 --- a/cpu/mpc5xxx/cpu_init.c +++ b/cpu/mpc5xxx/cpu_init.c @@ -152,19 +152,25 @@ void cpu_init_f (void) /* enable timebase */ *(vu_long *)(MPC5XXX_XLBARB + 0x40) |= (1 << 13); -#if defined(CFG_IPBSPEED_133) +# if defined(CFG_IPBSPEED_133) /* Motorola reports IPB should better run at 133 MHz. */ *(vu_long *)MPC5XXX_ADDECR |= 1; /* pci_clk_sel = 0x02, ipb_clk_sel = 0x00; */ addecr = *(vu_long *)MPC5XXX_CDM_CFG; addecr &= ~0x103; +# if defined(CFG_PCISPEED_66) + /* pci_clk_sel = 0x01 -> IPB_CLK/2 */ + addecr |= 0x01; +# else + /* pci_clk_sel = 0x02 -> XLB_CLK/4 = IPB_CLK/4 */ addecr |= 0x02; +# endif /* CFG_PCISPEED_66 */ *(vu_long *)MPC5XXX_CDM_CFG = addecr; -#endif +# endif /* CFG_IPBSPEED_133 */ /* Configure the XLB Arbiter */ *(vu_long *)MPC5XXX_XLBARB_MPRIEN = 0xff; *(vu_long *)MPC5XXX_XLBARB_MPRIVAL = 0x11111111; -#endif +#endif /* CONFIG_MPC5200 */ } /* diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 5355a8131..e3e806508 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -863,9 +863,8 @@ int mpc5xxx_fec_initialize(bd_t * bis) fec->eth = (ethernet_regs *)MPC5XXX_FEC; fec->tbdBase = (FEC_TBD *)FEC_BD_BASE; fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD)); -#if defined(CONFIG_ICECUBE) || \ - defined(CONFIG_PM520) || \ - defined(CONFIG_TOP5200) +#if defined(CONFIG_ICECUBE) || defined(CONFIG_PM520) || \ + defined(CONFIG_TOP5200) || defined(CONFIG_TQM5200) # ifndef CONFIG_FEC_10MBIT fec->xcv_type = MII100; # else |