From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 8 Mar 2007 20:45:04 +0000 (+0100)
Subject: Merge with /home/hs/jupiter/u-boot
X-Git-Tag: v1.3.0-rc1~145
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dd0321f5f8d284782abee6e96c6da7548e88839f;p=u-boot

Merge with /home/hs/jupiter/u-boot
---

dd0321f5f8d284782abee6e96c6da7548e88839f
diff --cc cpu/mpc5xxx/fec.c
index e6392340a9,d6ee121df2..13a3870f3d
--- a/cpu/mpc5xxx/fec.c
+++ b/cpu/mpc5xxx/fec.c
@@@ -878,12 -878,13 +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)
 -    defined(CONFIG_JUPITER) || \
 -    defined(CONFIG_MCC200)  || defined(CONFIG_O2DNT)	|| \
 -    defined(CONFIG_PM520)   || defined(CONFIG_TOP5200)	|| \
 -    defined(CONFIG_TQM5200) || defined(CONFIG_V38B)	|| \
 -    defined(CONFIG_UC101)
++#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