diff options
Diffstat (limited to 'drivers/net/mpc5xxx_fec.c')
| -rw-r--r-- | drivers/net/mpc5xxx_fec.c | 28 | 
1 files changed, 3 insertions, 25 deletions
| diff --git a/drivers/net/mpc5xxx_fec.c b/drivers/net/mpc5xxx_fec.c index f8618b172..2bf901e13 100644 --- a/drivers/net/mpc5xxx_fec.c +++ b/drivers/net/mpc5xxx_fec.c @@ -19,9 +19,6 @@ DECLARE_GLOBAL_DATA_PTR;  /* #define DEBUG	0x28 */ -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \ -	defined(CONFIG_MPC5xxx_FEC) -  #if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))  #error "CONFIG_MII has to be defined!"  #endif @@ -891,28 +888,11 @@ 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_CM5200)		|| \ -	defined(CONFIG_HMI1001)		|| \ -	defined(CONFIG_ICECUBE)		|| \ -	defined(CONFIG_INKA4X0)		|| \ -	defined(CONFIG_JUPITER)		|| \ -	defined(CONFIG_MCC200)		|| \ -	defined(CONFIG_MOTIONPRO)	|| \ -	defined(CONFIG_MUCMC52)		|| \ -	defined(CONFIG_O2DNT)		|| \ -	defined(CONFIG_PM520)		|| \ -	defined(CONFIG_TOP5200)		|| \ -	defined(CONFIG_TQM5200)		|| \ -	defined(CONFIG_UC101)		|| \ -	defined(CONFIG_V38B)		|| \ -	defined(CONFIG_MUNICES) -# ifndef CONFIG_FEC_10MBIT +#if defined(CONFIG_MPC5xxx_FEC_MII100)  	fec->xcv_type = MII100; -# else +#elif defined(CONFIG_MPC5xxx_FEC_MII10)  	fec->xcv_type = MII10; -# endif -#elif defined(CONFIG_TOTAL5200) +#elif defined(CONFIG_MPC5xxx_FEC_SEVENWIRE)  	fec->xcv_type = SEVENWIRE;  #else  #error fec->xcv_type not initialized. @@ -1064,5 +1044,3 @@ static uint32 local_crc32(char *string, unsigned int crc_value, int len)  	 /**/ return crc;  }  #endif	/* DEBUG */ - -#endif /* CONFIG_MPC5xxx_FEC */ |