[U-Boot] [PATCH v3] net ppc: fix ethernet device names with spaces

Heiko Schocher heiko.schocher at invitel.hu
Tue Jul 20 17:45:02 CEST 2010 

since commit 1384f3bb8a4f9066805b70c1418eda78ecb73fdd ethernet names
with spaces drop a

Warning: eth device name has a space!

message. This patch fix it for:

- "FEC ETHERNET" devices found on
  mpc512x, mpc5xxx, mpc8xx and mpc8220 boards.
  renamed to "FEC".
- "SCC ETHERNET" devices found on
  mpc8xx, mpc82xx based boards. Renamed to "SCC".
- "HDLC ETHERNET" devices found on mpc8xx boards
  Renamed to "HDLC"
- "FCC ETHERNET" devices found on mpc8260 and mpc85xx based
  boards. Renamed to "FCC"

Tested on the kup4k board.

Signed-off-by: Heiko Schocher <hs at denx.de>

---
- changes since v1:
  - added comment from Wolfgang Denk
    - add SCC and FCC devices
  - add HDLC device
  - fixed all (hopefully) occurences

- changes since v2
  - don;t change board specific readme files
  - changed subject name

 README                                   |    8 ++++----
 arch/powerpc/cpu/mpc8220/fec.c           |    2 +-
 arch/powerpc/cpu/mpc8260/ether_fcc.c     |    2 +-
 arch/powerpc/cpu/mpc8260/ether_scc.c     |    2 +-
 arch/powerpc/cpu/mpc85xx/ether_fcc.c     |    2 +-
 arch/powerpc/cpu/mpc8xx/fec.c            |    4 ++--
 arch/powerpc/cpu/mpc8xx/scc.c            |    2 +-
 board/freescale/mpc8560ads/mpc8560ads.c  |    2 +-
 board/funkwerk/vovpn-gw/vovpn-gw.c       |    2 +-
 board/keymile/common/keymile_hdlc_enet.c |    4 ++--
 board/keymile/km8xx/km8xx_hdlc_enet.c    |    2 +-
 board/motionpro/motionpro.c              |    4 ++--
 board/sbc8560/sbc8560.c                  |    2 +-
 board/stx/stxgp3/stxgp3.c                |    2 +-
 board/stx/stxssa/stxssa.c                |    2 +-
 board/stx/stxxtc/stxxtc.c                |    6 +++---
 board/tqc/tqm8xx/tqm8xx.c                |    4 ++--
 doc/uImage.FIT/howto.txt                 |    4 ++--
 drivers/net/mpc512x_fec.c                |    2 +-
 drivers/net/mpc5xxx_fec.c                |    2 +-
 include/configs/NSCU.h                   |    1 -
 include/configs/TK885D.h                 |    6 +++---
 include/configs/TQM855L.h                |    2 +-
 include/configs/TQM855M.h                |    2 +-
 include/configs/TQM860L.h                |    2 +-
 include/configs/TQM860M.h                |    2 +-
 include/configs/TQM862L.h                |    2 +-
 include/configs/TQM862M.h                |    2 +-
 include/configs/TQM866M.h                |    2 +-
 include/configs/TQM885D.h                |    2 +-
 include/configs/ep82xxm.h                |    2 +-
 include/configs/idmr.h                   |    2 +-
 include/configs/keymile-common.h         |    4 ++--
 include/configs/km8xx.h                  |    2 +-
 include/configs/v38b.h                   |    2 +-
 35 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/README b/README
index a9c98f2..22c2a71 100644
--- a/README
+++ b/README
@@ -3148,10 +3148,10 @@ List of environment variables (most likely not complete):
 		  interface is currently active. For example you
 		  can do the following

-		  => setenv ethact FEC ETHERNET
-		  => ping 192.168.0.1 # traffic sent on FEC ETHERNET
-		  => setenv ethact SCC ETHERNET
-		  => ping 10.0.0.1 # traffic sent on SCC ETHERNET
+		  => setenv ethact FEC
+		  => ping 192.168.0.1 # traffic sent on FEC
+		  => setenv ethact SCC
+		  => ping 10.0.0.1 # traffic sent on SCC

   ethrotate	- When set to "no" U-Boot does not go through all
 		  available network interfaces.
diff --git a/arch/powerpc/cpu/mpc8220/fec.c b/arch/powerpc/cpu/mpc8220/fec.c
index 5df9735..9a6d434 100644
--- a/arch/powerpc/cpu/mpc8220/fec.c
+++ b/arch/powerpc/cpu/mpc8220/fec.c
@@ -840,7 +840,7 @@ int mpc8220_fec_initialize (bd_t * bis)
 	dev->send = mpc8220_fec_send;
 	dev->recv = mpc8220_fec_recv;

-	sprintf (dev->name, "FEC ETHERNET");
+	sprintf (dev->name, "FEC");
 	eth_register (dev);

 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/arch/powerpc/cpu/mpc8260/ether_fcc.c b/arch/powerpc/cpu/mpc8260/ether_fcc.c
index 5ac02a0..c82958d 100644
--- a/arch/powerpc/cpu/mpc8260/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_fcc.c
@@ -383,7 +383,7 @@ int fec_initialize(bd_t *bis)
 		dev = (struct eth_device*) malloc(sizeof *dev);
 		memset(dev, 0, sizeof *dev);

-		sprintf(dev->name, "FCC%d ETHERNET",
+		sprintf(dev->name, "FCC%d",
 			ether_fcc_info[i].ether_index + 1);
 		dev->priv   = &ether_fcc_info[i];
 		dev->init   = fec_init;
diff --git a/arch/powerpc/cpu/mpc8260/ether_scc.c b/arch/powerpc/cpu/mpc8260/ether_scc.c
index 432111d..2870a9c 100644
--- a/arch/powerpc/cpu/mpc8260/ether_scc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_scc.c
@@ -375,7 +375,7 @@ int mpc82xx_scc_enet_initialize(bd_t *bis)
 	dev = (struct eth_device *) malloc(sizeof *dev);
 	memset(dev, 0, sizeof *dev);

-	sprintf(dev->name, "SCC ETHERNET");
+	sprintf(dev->name, "SCC");
 	dev->init   = sec_init;
 	dev->halt   = sec_halt;
 	dev->send   = sec_send;
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 5f1414d..f69b2e6 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -446,7 +446,7 @@ int fec_initialize(bd_t *bis)
 		dev = (struct eth_device*) malloc(sizeof *dev);
 		memset(dev, 0, sizeof *dev);

-		sprintf(dev->name, "FCC%d ETHERNET",
+		sprintf(dev->name, "FCC%d",
 			ether_fcc_info[i].ether_index + 1);
 		dev->priv   = &ether_fcc_info[i];
 		dev->init   = fec_init;
diff --git a/arch/powerpc/cpu/mpc8xx/fec.c b/arch/powerpc/cpu/mpc8xx/fec.c
index 89c1ff9..754f8db 100644
--- a/arch/powerpc/cpu/mpc8xx/fec.c
+++ b/arch/powerpc/cpu/mpc8xx/fec.c
@@ -164,9 +164,9 @@ int fec_initialize(bd_t *bis)
 		/* for FEC1 make sure that the name of the interface is the same
 		   as the old one for compatibility reasons */
 		if (i == 0) {
-			sprintf (dev->name, "FEC ETHERNET");
+			sprintf (dev->name, "FEC");
 		} else {
-			sprintf (dev->name, "FEC%d ETHERNET",
+			sprintf (dev->name, "FEC%d",
 				ether_fcc_info[i].ether_index + 1);
 		}

diff --git a/arch/powerpc/cpu/mpc8xx/scc.c b/arch/powerpc/cpu/mpc8xx/scc.c
index effb967..e376c64 100644
--- a/arch/powerpc/cpu/mpc8xx/scc.c
+++ b/arch/powerpc/cpu/mpc8xx/scc.c
@@ -77,7 +77,7 @@ int scc_initialize(bd_t *bis)
 	dev = (struct eth_device*) malloc(sizeof *dev);
 	memset(dev, 0, sizeof *dev);

-	sprintf(dev->name, "SCC ETHERNET");
+	sprintf(dev->name, "SCC");
 	dev->iobase = 0;
 	dev->priv   = 0;
 	dev->init   = scc_init;
diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c
index 489f90b..423e9d7 100644
--- a/board/freescale/mpc8560ads/mpc8560ads.c
+++ b/board/freescale/mpc8560ads/mpc8560ads.c
@@ -236,7 +236,7 @@ void reset_phy (void)
 #endif
 #if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
 	/* reset PHY */
-	miiphy_reset("FCC1 ETHERNET", 0x0);
+	miiphy_reset("FCC1", 0x0);

 	/* change PHY address to 0x02 */
 	bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
diff --git a/board/funkwerk/vovpn-gw/vovpn-gw.c b/board/funkwerk/vovpn-gw/vovpn-gw.c
index 889ba3f..e856ada 100644
--- a/board/funkwerk/vovpn-gw/vovpn-gw.c
+++ b/board/funkwerk/vovpn-gw/vovpn-gw.c
@@ -198,7 +198,7 @@ void reset_phy (void)
 	iop->pdat |= 0x00080000;
 	for (i=0; i<100; i++) {
 		udelay(20000);
-		if (bb_miiphy_read("FCC1 ETHERNET", CONFIG_SYS_PHY_ADDR,2,&val ) == 0) {
+		if (bb_miiphy_read("FCC1", CONFIG_SYS_PHY_ADDR,2,&val ) == 0) {
 			break;
 		}
 	}
diff --git a/board/keymile/common/keymile_hdlc_enet.c b/board/keymile/common/keymile_hdlc_enet.c
index ce5e4d6..a545211 100644
--- a/board/keymile/common/keymile_hdlc_enet.c
+++ b/board/keymile/common/keymile_hdlc_enet.c
@@ -40,7 +40,7 @@ extern char keymile_slot;	/* our slot number in the backplane */
 #define TOUT_LOOP	50000

 /*
- * Since, except during initialization, ethact is always HDLC ETHERNET
+ * Since, except during initialization, ethact is always HDLC
  * while we're in the driver, just use serial_printf() everywhere for
  * output.  This avoids possible conflicts when netconsole is being
  * used.
@@ -124,7 +124,7 @@ int keymile_hdlc_enet_initialize(bd_t *bis)
 	seth = dev;
 #endif

-	sprintf(dev->name, "HDLC ETHERNET");
+	sprintf(dev->name, "HDLC");
 	dev->init   = keymile_hdlc_enet_init;
 	dev->halt   = keymile_hdlc_enet_halt;
 	dev->send   = keymile_hdlc_enet_send;
diff --git a/board/keymile/km8xx/km8xx_hdlc_enet.c b/board/keymile/km8xx/km8xx_hdlc_enet.c
index 0478288..ca00576 100644
--- a/board/keymile/km8xx/km8xx_hdlc_enet.c
+++ b/board/keymile/km8xx/km8xx_hdlc_enet.c
@@ -34,7 +34,7 @@
 char keymile_slot;	/* our slot number in the backplane */

 /*
- * Since, except during initialization, ethact is always HDLC ETHERNET
+ * Since, except during initialization, ethact is always HDLC
  * while we're in the driver, just use serial_printf() everywhere for
  * output.  This avoids possible conflicts when netconsole is being
  * used.
diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c
index b369219..47ef6e5 100644
--- a/board/motionpro/motionpro.c
+++ b/board/motionpro/motionpro.c
@@ -90,8 +90,8 @@ void reset_phy(void)
 {
 	unsigned short mode_control;

-	miiphy_read("FEC ETHERNET", CONFIG_PHY_ADDR, 0x15, &mode_control);
-	miiphy_write("FEC ETHERNET", CONFIG_PHY_ADDR, 0x15,
+	miiphy_read("FEC", CONFIG_PHY_ADDR, 0x15, &mode_control);
+	miiphy_write("FEC", CONFIG_PHY_ADDR, 0x15,
 			mode_control & 0xfffe);
 	return;
 }
diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c
index 10ba62f..77abde5 100644
--- a/board/sbc8560/sbc8560.c
+++ b/board/sbc8560/sbc8560.c
@@ -225,7 +225,7 @@ void reset_phy (void)
 #endif
 #if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
 	/* reset PHY */
-	miiphy_reset("FCC1 ETHERNET", 0x0);
+	miiphy_reset("FCC1", 0x0);

 	/* change PHY address to 0x02 */
 	bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
diff --git a/board/stx/stxgp3/stxgp3.c b/board/stx/stxgp3/stxgp3.c
index 3804fe0..25d5211 100644
--- a/board/stx/stxgp3/stxgp3.c
+++ b/board/stx/stxgp3/stxgp3.c
@@ -239,7 +239,7 @@ reset_phy(void)
 #endif
 #if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
 	/* reset PHY */
-	miiphy_reset("FCC1 ETHERNET", 0x0);
+	miiphy_reset("FCC1", 0x0);

 	/* change PHY address to 0x02 */
 	bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c
index 0b2584c..1e0acab 100644
--- a/board/stx/stxssa/stxssa.c
+++ b/board/stx/stxssa/stxssa.c
@@ -238,7 +238,7 @@ reset_phy(void)
 #endif
 #if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
 	/* reset PHY */
-	miiphy_reset("FCC1 ETHERNET", 0x0);
+	miiphy_reset("FCC1", 0x0);

 	/* change PHY address to 0x02 */
 	bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
diff --git a/board/stx/stxxtc/stxxtc.c b/board/stx/stxxtc/stxxtc.c
index 717dbe2..6693a70 100644
--- a/board/stx/stxxtc/stxxtc.c
+++ b/board/stx/stxxtc/stxxtc.c
@@ -481,12 +481,12 @@ void reset_phys(void)
 	mii_init();

 	for (phyno = 0; phyno < 32; ++phyno) {
-		miiphy_read("FEC ETHERNET", phyno, PHY_PHYIDR1, &v);
+		miiphy_read("FEC", phyno, PHY_PHYIDR1, &v);
 		if (v == 0xFFFF)
 			continue;
-		miiphy_write("FEC ETHERNET", phyno, PHY_BMCR, PHY_BMCR_POWD);
+		miiphy_write("FEC", phyno, PHY_BMCR, PHY_BMCR_POWD);
 		udelay(10000);
-		miiphy_write("FEC ETHERNET", phyno, PHY_BMCR, PHY_BMCR_RESET | PHY_BMCR_AUTON);
+		miiphy_write("FEC", phyno, PHY_BMCR, PHY_BMCR_RESET | PHY_BMCR_AUTON);
 		udelay(10000);
 	}
 }
diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c
index 53f79e8..cde780b 100644
--- a/board/tqc/tqm8xx/tqm8xx.c
+++ b/board/tqc/tqm8xx/tqm8xx.c
@@ -745,13 +745,13 @@ int last_stage_init(void)
 		return 0;

 	for (i = 0; i < 2; i++) {
-		ret = miiphy_read("FEC ETHERNET", phy[i], PHY_BMCR, &reg);
+		ret = miiphy_read("FEC", phy[i], PHY_BMCR, &reg);
 		if (ret) {
 			printf("Cannot read BMCR on PHY %d\n", phy[i]);
 			return 0;
 		}
 		/* Auto-negotiation off, hard set full duplex, 100Mbps */
-		ret = miiphy_write("FEC ETHERNET", phy[i],
+		ret = miiphy_write("FEC", phy[i],
 				   PHY_BMCR, (reg | PHY_BMCR_100MB |
 					      PHY_BMCR_DPLX) & ~PHY_BMCR_AUTON);
 		if (ret) {
diff --git a/doc/uImage.FIT/howto.txt b/doc/uImage.FIT/howto.txt
index 8065e9e..59e21e9 100644
--- a/doc/uImage.FIT/howto.txt
+++ b/doc/uImage.FIT/howto.txt
@@ -93,7 +93,7 @@ nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
 addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1
 => run nfsargs addip
 => tftp 900000 /path/to/tftp/location/kernel.itb
-Using FEC ETHERNET device
+Using FEC device
 TFTP from server 192.168.1.1; our IP address is 192.168.160.5
 Filename '/path/to/tftp/location/kernel.itb'.
 Load address: 0x900000
@@ -207,7 +207,7 @@ inspected and booted:

 [on the target system]
 => tftp 900000 /path/to/tftp/location/kernel_fdt.itb
-Using FEC ETHERNET device
+Using FEC device
 TFTP from server 192.168.1.1; our IP address is 192.168.160.5
 Filename '/path/to/tftp/location/kernel_fdt.itb'.
 Load address: 0x900000
diff --git a/drivers/net/mpc512x_fec.c b/drivers/net/mpc512x_fec.c
index c580c82..6ea4a2b 100644
--- a/drivers/net/mpc512x_fec.c
+++ b/drivers/net/mpc512x_fec.c
@@ -637,7 +637,7 @@ int mpc512x_fec_initialize (bd_t * bis)
 	dev->send = mpc512x_fec_send;
 	dev->recv = mpc512x_fec_recv;

-	sprintf (dev->name, "FEC ETHERNET");
+	sprintf (dev->name, "FEC");
 	eth_register (dev);

 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/drivers/net/mpc5xxx_fec.c b/drivers/net/mpc5xxx_fec.c
index 1681e26..4a1c8e6 100644
--- a/drivers/net/mpc5xxx_fec.c
+++ b/drivers/net/mpc5xxx_fec.c
@@ -913,7 +913,7 @@ int mpc5xxx_fec_initialize(bd_t * bis)
 	dev->send = mpc5xxx_fec_send;
 	dev->recv = mpc5xxx_fec_recv;

-	sprintf(dev->name, "FEC ETHERNET");
+	sprintf(dev->name, "FEC");
 	eth_register(dev);

 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 5724f45..6a4c47d 100644
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -485,7 +485,6 @@

 #undef CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-/* #define CONFIG_ETHPRIME		"FEC ETHERNET" */

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 0df1b6e..7cefa32 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -65,8 +65,8 @@
 #undef	CONFIG_BOOTARGS

 #define CONFIG_EXTRA_ENV_SETTINGS					\
-	"ethprime=FEC ETHERNET\0"					\
-	"ethact=FEC ETHERNET\0"						\
+	"ethprime=FEC\0"						\
+	"ethact=FEC\0"							\
 	"netdev=eth0\0"							\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
 		"nfsroot=${serverip}:${rootpath}\0"			\
@@ -514,7 +514,7 @@
 #define CONFIG_MII_INIT	1

 #define CONFIG_NET_RETRY_COUNT	3
-#define CONFIG_ETHPRIME		"FEC ETHERNET"
+#define CONFIG_ETHPRIME		"FEC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 32a7e79..5bf8f02 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -481,7 +481,7 @@

 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 4f44be3..456ed7e 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -516,7 +516,7 @@

 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index e86fe5e..94b9a3b 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -480,7 +480,7 @@

 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT       1
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 4fd873b..ce5e691 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -484,7 +484,7 @@

 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 0c966c9..d77df9c 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -486,7 +486,7 @@
 #define CONFIG_NET_MULTI
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 178e6e2..a6c465b 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -487,7 +487,7 @@
 #define CONFIG_NET_MULTI
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index a65946d..9ec815c 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -506,7 +506,7 @@

 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 0fc4b69..c715c07 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -506,7 +506,7 @@
 					   switching to another netwok (if the
 					   tried network is unreachable) */

-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"

 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index c737f10..b52b941 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -147,7 +147,7 @@
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
 #define CONFIG_ENV_IN_OWN_SECT	1
 #define CONFIG_AUTO_COMPLETE	1
-#define	CONFIG_EXTRA_ENV_SETTINGS	"ethprime=FCC3 ETHERNET"
+#define	CONFIG_EXTRA_ENV_SETTINGS	"ethprime=FCC3"

 #if defined(CONFIG_CMD_KGDB)
 #undef	CONFIG_KGDB_ON_SMC		/* define if kgdb on SMC */
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 61e3bad..8105876 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -74,7 +74,7 @@
 	"net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"	\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
 		"nfsroot=$(serverip):$(rootpath)\0"			\
-	"ethact=FEC ETHERNET\0"						\
+	"ethact=FEC\0	"						\
 	"update=prot off ff800000 ff81ffff; era ff800000 ff81ffff; "	\
 		"cp.b 200000 ff800000 $(filesize);"			\
 		"prot on ff800000 ff81ffff\0"				\
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index 3a9f790..6c14ca0 100644
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -139,8 +139,8 @@

 #ifdef CONFIG_IO_MUXING
 #define	CONFIG_KM_DEF_ENV_IOMUX \
-	"nc=setenv ethact HDLC ETHERNET \0" \
-	"nce=setenv ethact SCC ETHERNET \0"	\
+	"nc=setenv ethact HDLC \0" \
+	"nce=setenv ethact SCC \0"	\
 	"stderr=serial,nc \0"	\
 	"stdin=serial,nc \0" \
 	"stdout=serial,nc \0" \
diff --git a/include/configs/km8xx.h b/include/configs/km8xx.h
index b5552d2..a10744e 100644
--- a/include/configs/km8xx.h
+++ b/include/configs/km8xx.h
@@ -280,7 +280,7 @@
 #define BOOTFLAG_WARM	0x02	/* Software reboot		    */

 #define CONFIG_SCC3_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 #define CONFIG_HAS_ETH0

 /* pass open firmware flat tree */
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index d462ed0..600ccfb 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -154,7 +154,7 @@
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
 		"nfsroot=$(serverip):$(rootpath) wdt=off\0"		\
 	"hostname=v38b\0"						\
-	"ethact=FEC ETHERNET\0"						\
+	"ethact=FEC\0"							\
 	"rootpath=/opt/eldk-3.1.1/ppc_6xx\0"				\
 	"update=prot off ff000000 ff03ffff; era ff000000 ff03ffff; "	\
 		"cp.b 200000 ff000000 $(filesize);"			\
-- 
1.6.2.5

More information about the U-Boot mailing list