diff options
| -rw-r--r-- | doc/README.kmeter1 | 2 | ||||
| -rw-r--r-- | drivers/qe/uec.c | 2 | ||||
| -rw-r--r-- | drivers/qe/uec_phy.c | 6 | ||||
| -rw-r--r-- | include/configs/MPC8323ERDB.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC832XEMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8360EMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8360ERDK.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8568MDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8569MDS.h | 2 | ||||
| -rw-r--r-- | include/configs/kmeter1.h | 2 | 
10 files changed, 12 insertions, 12 deletions
| diff --git a/doc/README.kmeter1 b/doc/README.kmeter1 index 44ebb7a78..7f4fc999f 100644 --- a/doc/README.kmeter1 +++ b/doc/README.kmeter1 @@ -51,7 +51,7 @@ Keymile kmeter1 Board  	tftp 10000 u-boot.bin      => run load -    Using FSL UEC0 device +    Using UEC0 device      TFTP from server 192.168.1.1; our IP address is 192.168.205.4      Filename '/tftpboot/kmeter1/u-boot.bin'.      Load address: 0x200000 diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c index ccbf27d0b..3e92fe95a 100644 --- a/drivers/qe/uec.c +++ b/drivers/qe/uec.c @@ -1367,7 +1367,7 @@ int uec_initialize(bd_t *bis, uec_info_t *uec_info)  	uec->uec_info = uec_info;  	uec->dev = dev; -	sprintf(dev->name, "FSL UEC%d", uec_info->uf_info.ucc_num); +	sprintf(dev->name, "UEC%d", uec_info->uf_info.ucc_num);  	dev->iobase = 0;  	dev->priv = (void *)uec;  	dev->init = uec_init; diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index 3baffe42f..2d3a896d6 100644 --- a/drivers/qe/uec_phy.c +++ b/drivers/qe/uec_phy.c @@ -71,8 +71,8 @@   *                 {name, speed, duplex},   *   *     #define CONFIG_SYS_FIXED_PHY_PORTS \ - *                 CONFIG_SYS_FIXED_PHY_PORT("FSL UEC0",SPEED_100,DUPLEX_FULL) \ - *                 CONFIG_SYS_FIXED_PHY_PORT("FSL UEC2",SPEED_100,DUPLEX_HALF) + *                 CONFIG_SYS_FIXED_PHY_PORT("UEC0",SPEED_100,DUPLEX_FULL) \ + *                 CONFIG_SYS_FIXED_PHY_PORT("UEC2",SPEED_100,DUPLEX_HALF)   */  #ifndef CONFIG_FIXED_PHY @@ -102,7 +102,7 @@ static const struct fixed_phy_port fixed_phy_port[] = {   * Example board header file to define bitbang ethernet ports:   *   * #define CONFIG_SYS_BITBANG_PHY_PORT(name) name, - * #define CONFIG_SYS_BITBANG_PHY_PORTS CONFIG_SYS_BITBANG_PHY_PORT("FSL UEC0") + * #define CONFIG_SYS_BITBANG_PHY_PORTS CONFIG_SYS_BITBANG_PHY_PORT("UEC0")  */  #ifndef CONFIG_SYS_BITBANG_PHY_PORTS  #define CONFIG_SYS_BITBANG_PHY_PORTS	/* default is an empty array */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 7c843939c..9a296a1e4 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -338,7 +338,7 @@   * QE UEC ethernet configuration   */  #define CONFIG_UEC_ETH -#define CONFIG_ETHPRIME		"FSL UEC0" +#define CONFIG_ETHPRIME		"UEC0"  #define CONFIG_UEC_ETH1		/* ETH3 */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 7bd279369..68ff19166 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -353,7 +353,7 @@   * QE UEC ethernet configuration   */  #define CONFIG_UEC_ETH -#define CONFIG_ETHPRIME		"FSL UEC0" +#define CONFIG_ETHPRIME		"UEC0"  #define CONFIG_UEC_ETH1		/* ETH3 */ diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index 87a137b3a..c58e0031a 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -390,7 +390,7 @@   * QE UEC ethernet configuration   */  #define CONFIG_UEC_ETH -#define CONFIG_ETHPRIME		"FSL UEC0" +#define CONFIG_ETHPRIME		"UEC0"  #define CONFIG_PHY_MODE_NEED_CHANGE  #define CONFIG_UEC_ETH1		/* GETH1 */ diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h index e78cf60a1..9fa577df9 100644 --- a/include/configs/MPC8360ERDK.h +++ b/include/configs/MPC8360ERDK.h @@ -309,7 +309,7 @@   * QE UEC ethernet configuration   */  #define CONFIG_UEC_ETH -#define CONFIG_ETHPRIME		"FSL UEC0" +#define CONFIG_ETHPRIME		"UEC0"  #define CONFIG_UEC_ETH1		/* GETH1 */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index ea7a134b8..2dc293252 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -313,7 +313,7 @@ extern unsigned long get_clock_freq(void);   */  #define CONFIG_UEC_ETH  #ifndef CONFIG_TSEC_ENET -#define CONFIG_ETHPRIME         "FSL UEC0" +#define CONFIG_ETHPRIME         "UEC0"  #endif  #define CONFIG_PHY_MODE_NEED_CHANGE  #define CONFIG_eTSEC_MDIO_BUS diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index f69b65018..8177db371 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -363,7 +363,7 @@ extern unsigned long get_clock_freq(void);  #define CONFIG_MIIM_ADDRESS	(CONFIG_SYS_CCSRBAR + 0x82120)  #define CONFIG_UEC_ETH -#define CONFIG_ETHPRIME         "FSL UEC0" +#define CONFIG_ETHPRIME         "UEC0"  #define CONFIG_PHY_MODE_NEED_CHANGE  #define CONFIG_UEC_ETH1         /* GETH1 */ diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 64972317f..f7d36b1ff 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -284,7 +284,7 @@   * QE UEC ethernet configuration   */  #define CONFIG_UEC_ETH -#define CONFIG_ETHPRIME		"FSL UEC0" +#define CONFIG_ETHPRIME		"UEC0"  #define CONFIG_UEC_ETH1		/* GETH1 */  #define UEC_VERBOSE_DEBUG	1 |