net: removed board-specific CONFIGs from MPC5xxx FEC driver
PATCH 1/1 net: removed board-specific CONFIGs from MPC5xxx FEC driver
Added new CONFIG options for the three type of MAC-PHY interconnect and applied them all relevant board config files
Signed-off-by Ben Warren <[email protected]>
---
Note: compile tested only, since I don't have any 5xxx hardware
drivers/net/mpc5xxx_fec.c | 28 +++------------------------- include/configs/BC3450.h | 5 +++-- include/configs/IceCube.h | 8 +++----- include/configs/PM520.h | 5 +++-- include/configs/TB5200.h | 5 +++-- include/configs/TOP5200.h | 2 +- include/configs/TQM5200.h | 5 +++-- include/configs/Total5200.h | 1 + include/configs/canmb.h | 1 + include/configs/cm5200.h | 1 + include/configs/cpci5200.h | 1 + include/configs/hmi1001.h | 1 + include/configs/inka4x0.h | 5 +++-- include/configs/jupiter.h | 5 +++-- include/configs/mcc200.h | 7 ++++--- include/configs/mecp5200.h | 5 +++-- include/configs/motionpro.h | 1 + include/configs/mucmc52.h | 1 + include/configs/munices.h | 1 + include/configs/o2dnt.h | 5 +++-- include/configs/pf5200.h | 5 +++-- include/configs/uc101.h | 1 + include/configs/v38b.h | 1 + 23 files changed, 48 insertions(+), 52 deletions(-)
drivers/net/mpc5xxx_fec.c +3 -25
@@ -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 */
include/configs/BC3450.h +3 -2
@@ -396,10 +396,11 @@/* * Ethernet configuration * -* Define CONFIG_FEC10MBIT to force FEC at 10MBIT +* Define CONFIG_MPC5xxx_MII10 to force FEC at 10MBIT */ #define CONFIG_MPC5xxx_FEC 1 -#undef CONFIG_FEC_10MBIT +#define CONFIG_MPC5xxx_FEC_MII100 +#undef CONFIG_MPC5xxx_MII10#define CONFIG_PHY_ADDR 0x00/*
include/configs/IceCube.h +3 -5
@@ -293,14 +293,12 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00 -#if defined(CONFIG_LITE5200B ) -#define CONFIG_FEC_MII100 1 -#endif /* * GPIO configuration
include/configs/PM520.h +3 -2
@@ -279,10 +279,11 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00/*
include/configs/TB5200.h +3 -2
@@ -344,10 +344,11 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00/*
include/configs/TOP5200.h +1 -1
@@ -312,7 +312,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 -#define CONFIG_FEC_10MBIT 1/* Workaround for FEC 100Mbit problem */ +#define CONFIG_MPC5xxx_FEC_MII10/* Workaround for FEC 100Mbit problem */ #define CONFIG_PHY_ADDR 0x1f#define CONFIG_PHY_TYPE 0x79c874/*
include/configs/TQM5200.h +3 -2
@@ -507,10 +507,11 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00/*
include/configs/Total5200.h +1 -0
@@ -268,6 +268,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_SEVENWIRE/* dummy, 7-wire FEC does not have phy address */ #define CONFIG_PHY_ADDR 0x00
include/configs/canmb.h +1 -0
@@ -173,6 +173,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100#define CONFIG_PHY_ADDR 0x0/* * GPIO configuration:
include/configs/cm5200.h +1 -0
@@ -65,6 +65,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100#define CONFIG_PHY_ADDR 0x00#define CONFIG_ENV_OVERWRITE 1/* allow overwriting of ethaddr */ /* use misc_init_r() to read ethaddr from I2C EEPROM (see CONFIG_SYS_I2C_EEPROM) */
include/configs/cpci5200.h +1 -0
@@ -259,6 +259,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* * Define CONFIG_FEC_10MBIT to force FEC at 10Mb */
include/configs/hmi1001.h +1 -0
@@ -215,6 +215,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100#define CONFIG_PHY_ADDR 0x00#define CONFIG_MII 1/* MII PHY management */
include/configs/inka4x0.h +3 -2
@@ -221,10 +221,11 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00#define CONFIG_MII
include/configs/jupiter.h +3 -2
@@ -239,10 +239,11 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00/*
include/configs/mcc200.h +4 -3
@@ -271,11 +271,12 @@/* * Ethernet configuration */ -/*#define CONFIG_MPC5xxx_FEC 1*/ +/* #define CONFIG_MPC5xxx_FEC 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII100 */ /* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 1/*
include/configs/mecp5200.h +3 -2
@@ -243,10 +243,11 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00#define CONFIG_UDP_CHECKSUM 1
include/configs/motionpro.h +1 -0
@@ -82,6 +82,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100#define CONFIG_PHY_ADDR 0x2#define CONFIG_PHY_TYPE 0x79c874#define CONFIG_RESET_PHY_R 1
include/configs/mucmc52.h +1 -0
@@ -225,6 +225,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100#define CONFIG_PHY_ADDR 0x00#define CONFIG_MII 1/* MII PHY management */
include/configs/munices.h +1 -0
@@ -166,6 +166,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100#define CONFIG_PHY_ADDR 0x01#define CONFIG_MII 1
include/configs/o2dnt.h +3 -2
@@ -233,10 +233,11 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00/*
include/configs/pf5200.h +3 -2
@@ -245,10 +245,11 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100/* -* Define CONFIG_FEC_10MBIT to force FEC at 10Mb +* Define CONFIG_MPC5xxx_FEC_MII10 to force FEC at 10Mb */ -/* #define CONFIG_FEC_10MBIT 1 */ +/* #define CONFIG_MPC5xxx_FEC_MII10 */ #define CONFIG_PHY_ADDR 0x00#define CONFIG_UDP_CHECKSUM 1
include/configs/uc101.h +1 -0
@@ -233,6 +233,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100#define CONFIG_PHY_ADDR 0x00#define CONFIG_MII 1
include/configs/v38b.h +1 -0
@@ -247,6 +247,7 @@* Ethernet configuration */ #define CONFIG_MPC5xxx_FEC 1 +#define CONFIG_MPC5xxx_FEC_MII100#define CONFIG_PHY_ADDR 0x00#define CONFIG_MII 1
Signature · 1 line
1.5.6.3