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

diff --cc Makefile
Simple merge

diff --cc cpu/mpc5xxx/fec.c
index e6392340a944129873ca4d145e8b8148bba86502,d6ee121df2a52b5b6591d6b38c0198759d3f06a6..13a3870f3dc68b0b8c241f2a1a951a0e0a267fd9
--- 1/cpu/mpc5xxx/fec.c
--- 2/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