diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2010-07-26 23:34:57 (GMT) |
---|---|---|
committer | Ben Warren <biggerbadderben@gmail.com> | 2010-08-09 18:52:29 (GMT) |
commit | 78b7a8ef8b37582a37a5c2381191061380b42831 (patch) | |
tree | 83c83cf11bd20ffc752f0e158532b45a413c6836 | |
parent | 48690d8024eeeaee3120db702e54fcb238e6d9c7 (diff) | |
download | u-boot-fsl-qoriq-78b7a8ef8b37582a37a5c2381191061380b42831.tar.xz |
net: rename "FSL UECx" net interfaces "UECx"
continuation of commit 2ecc2262d66a286e3aac79005bcb5f461312dea8
"net ppc: fix ethernet device names with spaces" (currently in
u-boot-net.git) for QE based parts.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
-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 44ebb7a..7f4fc99 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 ccbf27d..3e92fe9 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 3baffe4..2d3a896 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 7c84393..9a296a1 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 7bd2793..68ff191 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 87a137b..c58e003 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 e78cf60..9fa577d 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 ea7a134..2dc2932 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 f69b650..8177db3 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 6497231..f7d36b1 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 |