diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2007-03-08 21:45:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-03-08 21:45:04 +0100 |
| commit | dd0321f5f8d284782abee6e96c6da7548e88839f (patch) | |
| tree | 70ae9a0c4145af78fe08e0626693ca385b1c5a6b /cpu | |
| parent | 35ded29fd941f3bd40660dd1440763f34708cf65 (diff) | |
| parent | 2605e90bf676d48123afe5719a846d2b52b24aac (diff) | |
| download | u-boot-dd0321f5f8d284782abee6e96c6da7548e88839f.zip u-boot-dd0321f5f8d284782abee6e96c6da7548e88839f.tar.gz u-boot-dd0321f5f8d284782abee6e96c6da7548e88839f.tar.bz2 | |
Merge with /home/hs/jupiter/u-boot
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index e639234..13a3870 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -878,12 +878,13 @@ 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_CANMB) || defined(CONFIG_HMI1001) || \ - defined(CONFIG_ICECUBE) || defined(CONFIG_INKA4X0) || \ - defined(CONFIG_MCC200) || defined(CONFIG_MOTIONPRO) || \ - defined(CONFIG_O2DNT) || defined(CONFIG_PM520) || \ - defined(CONFIG_TOP5200) || defined(CONFIG_TQM5200) || \ - defined(CONFIG_UC101) || defined(CONFIG_V38B) +#if defined(CONFIG_CANMB) || defined(CONFIG_HMI1001) || \ + defined(CONFIG_ICECUBE) || defined(CONFIG_INKA4X0) || \ + defined(CONFIG_JUPITER) || defined(CONFIG_MCC200) || \ + defined(CONFIG_MOTIONPRO)|| defined(CONFIG_O2DNT) || \ + defined(CONFIG_PM520) || defined(CONFIG_TOP5200) || \ + defined(CONFIG_TQM5200) || defined(CONFIG_UC101) || \ + defined(CONFIG_V38B) # ifndef CONFIG_FEC_10MBIT fec->xcv_type = MII100; # else |