net, fec: fix "Warning: eth device name has a space!" for FEC devices

PATCH New Heiko Schocher 4 participants 5 messages Jul 19, 2010 – Jul 20, 2010

Subsystems (2)

Network drivers PowerPC

lore

Share & tools

lore

Heiko Schocher

author

2010-07-19 21:51 UTC #0 lore raw

PATCH v2 1/1 net, fec: fix "Warning: eth device name has a space!" for FEC devices

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 <[email protected]>

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

 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/LEOX/elpt860/README.LEOX           |    8 ++++----
 board/RPXlite_dw/README                  |    4 ++--
 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/README.PlanetCore                    |    2 +-
 doc/README.alaska8220                    |    6 +++---
 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 +-
 39 files changed, 57 insertions(+), 58 deletions(-)

README +4 -4

index a9c98f2..22c2a71 100644
@@ -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.

arch/powerpc/cpu/mpc8220/fec.c +1 -1

index 5df9735..9a6d434 100644
@@ -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)

arch/powerpc/cpu/mpc8260/ether_fcc.c +1 -1

index 5ac02a0..c82958d 100644
@@ -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;

arch/powerpc/cpu/mpc8260/ether_scc.c +1 -1

index 432111d..2870a9c 100644
@@ -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;

arch/powerpc/cpu/mpc85xx/ether_fcc.c +1 -1

index 5f1414d..f69b2e6 100644
@@ -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;

arch/powerpc/cpu/mpc8xx/fec.c +2 -2

index 89c1ff9..754f8db 100644
@@ -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);
 		}

arch/powerpc/cpu/mpc8xx/scc.c +1 -1

index effb967..e376c64 100644
@@ -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;

board/LEOX/elpt860/README.LEOX +4 -4

index e8ab867..ee831e1 100644
@@ -61,7 +61,7 @@ FLASH: 512 kB
 In:    serial
 Out:   serial
 Err:   serial
-Net:   SCC ETHERNET
+Net:   SCC
 
 Type "run nfsboot" to mount root filesystem over NFS

@@ -184,7 +184,7 @@ FLASH: 512 kB
 In:    serial
 Out:   serial
 Err:   serial
-Net:   SCC ETHERNET
+Net:   SCC
 
 Type "run nfsboot" to mount root filesystem over NFS

@@ -226,7 +226,7 @@ FLASH: 512 kB
 In:    serial
 Out:   serial
 Err:   serial
-Net:   SCC ETHERNET
+Net:   SCC
 
 Type "run nfsboot" to mount root filesystem over NFS

@@ -323,7 +323,7 @@ FLASH: 512 kB
 In:    serial
 Out:   serial
 Err:   serial
-Net:   SCC ETHERNET
+Net:   SCC
 
 Type "run nfsboot" to mount root filesystem over NFS

board/RPXlite_dw/README +2 -2

index 14296b2..c7e5876 100644
@@ -82,7 +82,7 @@ FLASH: 16 MB
 In:    serial
 Out:   serial
 Err:   serial
-Net:   SCC ETHERNET
+Net:   SCC
 u-boot>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -109,7 +109,7 @@ kernel and u-boot image file respectively. You must tftp your image to default a
 job. :-) The example u-boot image updating process could be :
 
 u-boot>t 100000 RPXlite_DW_LCD.bin
-Using SCC ETHERNET device
+Using SCC device
 TFTP from server 172.16.115.6; our IP address is 172.16.115.7
 Filename 'RPXlite_DW_LCD.bin'.
 Load address: 0x100000

board/freescale/mpc8560ads/mpc8560ads.c +1 -1

index 489f90b..423e9d7 100644
@@ -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);

board/funkwerk/vovpn-gw/vovpn-gw.c +1 -1

index 889ba3f..e856ada 100644
@@ -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;
 		}
 	}

board/keymile/common/keymile_hdlc_enet.c +2 -2

index ce5e4d6..a545211 100644
@@ -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;

board/keymile/km8xx/km8xx_hdlc_enet.c +1 -1

index 0478288..ca00576 100644
@@ -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.

board/motionpro/motionpro.c +2 -2

index b369219..47ef6e5 100644
@@ -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;
 }

board/sbc8560/sbc8560.c +1 -1

index 10ba62f..77abde5 100644
@@ -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);

board/stx/stxgp3/stxgp3.c +1 -1

index 3804fe0..25d5211 100644
@@ -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);

board/stx/stxssa/stxssa.c +1 -1

index 0b2584c..1e0acab 100644
@@ -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);

board/stx/stxxtc/stxxtc.c +3 -3

index 717dbe2..6693a70 100644
@@ -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);
 	}
 }

board/tqc/tqm8xx/tqm8xx.c +2 -2

index 53f79e8..cde780b 100644
@@ -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) {

doc/README.PlanetCore +1 -1

index b73c5f5..ae751d7 100644
@@ -141,7 +141,7 @@ FLASH: 16 MB
 In:    serial
 Out:   serial
 Err:   serial
-Net:   SCC ETHERNET
+Net:   SCC
 u-boot>
 
 -------------------------------------------------

doc/README.alaska8220 +3 -3

index 3345073..a4c8096 100644
@@ -121,7 +121,7 @@ FLASH: 16.5 MB
 In:    serial
 Out:   serial
 Err:   serial
-Net:   FEC ETHERNET
+Net:   FEC
 => flinfo
 
 Bank # 1: INTEL 28F128J3A

@@ -203,7 +203,7 @@ hostname=Alaska
 stdin=serial
 stdout=serial
 stderr=serial
-ethact=FEC ETHERNET
+ethact=FEC
 
 Environment size: 268/65532 bytes
 => setenv ipaddr 192.160.1.2

@@ -222,7 +222,7 @@ Writing to Flash... done
 .
 Protected 1 sectors
 => tftp 0x10000 linux.elf
-Using FEC ETHERNET device
+Using FEC device
 TFTP from server 192.160.1.1; our IP address is 192.160.1.2; sending through gateway 192.160.1.1
 Filename 'linux.elf'.
 Load address: 0x10000

doc/uImage.FIT/howto.txt +2 -2

index 8065e9e..59e21e9 100644
@@ -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

drivers/net/mpc512x_fec.c +1 -1

index c580c82..6ea4a2b 100644
@@ -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)

drivers/net/mpc5xxx_fec.c +1 -1

index 1681e26..4a1c8e6 100644
@@ -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)

include/configs/NSCU.h +0 -1

index 5724f45..6a4c47d 100644
@@ -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

include/configs/TK885D.h +3 -3

index 0df1b6e..7cefa32 100644
@@ -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

include/configs/TQM855L.h +1 -1

index 32a7e79..5bf8f02 100644
@@ -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

include/configs/TQM855M.h +1 -1

index 4f44be3..456ed7e 100644
@@ -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

include/configs/TQM860L.h +1 -1

index e86fe5e..94b9a3b 100644
@@ -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

include/configs/TQM860M.h +1 -1

index 4fd873b..ce5e691 100644
@@ -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

include/configs/TQM862L.h +1 -1

index 0c966c9..d77df9c 100644
@@ -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

include/configs/TQM862M.h +1 -1

index 178e6e2..a6c465b 100644
@@ -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

include/configs/TQM866M.h +1 -1

index a65946d..9ec815c 100644
@@ -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

include/configs/TQM885D.h +1 -1

index 0fc4b69..c715c07 100644
@@ -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

include/configs/ep82xxm.h +1 -1

index c737f10..b52b941 100644
@@ -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 */

include/configs/idmr.h +1 -1

index 61e3bad..8105876 100644
@@ -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"				\

include/configs/keymile-common.h +2 -2

index 3a9f790..6c14ca0 100644
@@ -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" \

include/configs/km8xx.h +1 -1

index b5552d2..a10744e 100644
@@ -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 */

include/configs/v38b.h +1 -1

index d462ed0..600ccfb 100644
@@ -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);"			\

Signature · 5 lines

1.6.2.5

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Wolfgang Denk

2010-07-19 22:57 UTC #1 lore raw

PATCH v2 1/1 net, fec: fix "Warning: eth device name has a space!" for FEC devices

Dear Heiko Schocher,

Quoted 7 lines · In message <[email protected]> you wrote:

since commit 1384f3bb8a4f9066805b70c1418eda78ecb73fdd ethernet names with spaces drop a
Warning: eth device name has a space!
message. This patch fix it for:

Quoted 9 lines

- "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"

The Subject: (which is way too long, btw.) does not match the content of this patch.

I'm not sure if it is a good idea to change the board specific README's. For example, board/LEOX/elpt860/README.LEOX shows

	U-Boot 0.2.2 ...
	...
	Net:   SCC ETHERNET

For this specific version, the string was correct. Changing it is technically not correct.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The goal of science is to build better mousetraps. The goal of nature
is to build better mice.

Ben Warren

2010-07-19 23:02 UTC #2 lore raw

PATCH v2 1/1 net, fec: fix "Warning: eth device name has a space!" for FEC devices

Hi Heiko,

Quoted 30 lines · Wolfgang Denk

Dear Heiko Schocher,
Quoted 7 lines · In message<[email protected]> you wrote:
since commit 1384f3bb8a4f9066805b70c1418eda78ecb73fdd ethernet names with spaces drop a
Warning: eth device name has a space!
message. This patch fix it for:
Quoted 9 lines
- "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"
The Subject: (which is way too long, btw.) does not match the content of this patch.
I'm not sure if it is a good idea to change the board specific README's. For example, board/LEOX/elpt860/README.LEOX shows
	U-Boot 0.2.2 ...
	...
	Net:   SCC ETHERNET

Quoted 7 lines

For this specific version, the string was correct. Changing it is technically not correct.
Best regards,
Wolfgang Denk

I just ran MAKEALL on this and it's clean, so if you address Wolfgang's concerns we'll pull it in.

regards,
Ben

Heiko Schocher

2010-07-20 15:45 UTC #3 lore raw

PATCH v3 1/1 net ppc: fix ethernet device names with spaces

In reply to Wolfgang Denk

since commit 1384f3bb8a4f9066805b70c1418eda78ecb73fdd ethernet names with spaces drop a

Warning: eth device name has a space!

message. This patch fix it for:

Tested on the kup4k board.

Signed-off-by Heiko Schocher <[email protected]>

---
- 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(-)

README +4 -4

index a9c98f2..22c2a71 100644
@@ -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.

arch/powerpc/cpu/mpc8220/fec.c +1 -1

index 5df9735..9a6d434 100644
@@ -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)

arch/powerpc/cpu/mpc8260/ether_fcc.c +1 -1

index 5ac02a0..c82958d 100644
@@ -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;

arch/powerpc/cpu/mpc8260/ether_scc.c +1 -1

index 432111d..2870a9c 100644
@@ -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;

arch/powerpc/cpu/mpc85xx/ether_fcc.c +1 -1

index 5f1414d..f69b2e6 100644
@@ -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;

arch/powerpc/cpu/mpc8xx/fec.c +2 -2

index 89c1ff9..754f8db 100644
@@ -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);
 		}

arch/powerpc/cpu/mpc8xx/scc.c +1 -1

index effb967..e376c64 100644
@@ -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;

board/freescale/mpc8560ads/mpc8560ads.c +1 -1

index 489f90b..423e9d7 100644
@@ -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);

board/funkwerk/vovpn-gw/vovpn-gw.c +1 -1

index 889ba3f..e856ada 100644
@@ -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;
 		}
 	}

board/keymile/common/keymile_hdlc_enet.c +2 -2

index ce5e4d6..a545211 100644
@@ -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;

board/keymile/km8xx/km8xx_hdlc_enet.c +1 -1

index 0478288..ca00576 100644
@@ -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.

board/motionpro/motionpro.c +2 -2

index b369219..47ef6e5 100644
@@ -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;
 }

board/sbc8560/sbc8560.c +1 -1

index 10ba62f..77abde5 100644
@@ -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);

board/stx/stxgp3/stxgp3.c +1 -1

index 3804fe0..25d5211 100644
@@ -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);

board/stx/stxssa/stxssa.c +1 -1

index 0b2584c..1e0acab 100644
@@ -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);

board/stx/stxxtc/stxxtc.c +3 -3

index 717dbe2..6693a70 100644
@@ -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);
 	}
 }

board/tqc/tqm8xx/tqm8xx.c +2 -2

index 53f79e8..cde780b 100644
@@ -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) {

doc/uImage.FIT/howto.txt +2 -2

index 8065e9e..59e21e9 100644
@@ -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

drivers/net/mpc512x_fec.c +1 -1

index c580c82..6ea4a2b 100644
@@ -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)

drivers/net/mpc5xxx_fec.c +1 -1

index 1681e26..4a1c8e6 100644
@@ -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)

include/configs/NSCU.h +0 -1

index 5724f45..6a4c47d 100644
@@ -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

include/configs/TK885D.h +3 -3

index 0df1b6e..7cefa32 100644
@@ -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

include/configs/TQM855L.h +1 -1

index 32a7e79..5bf8f02 100644
@@ -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

include/configs/TQM855M.h +1 -1

index 4f44be3..456ed7e 100644
@@ -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

include/configs/TQM860L.h +1 -1

index e86fe5e..94b9a3b 100644
@@ -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

include/configs/TQM860M.h +1 -1

index 4fd873b..ce5e691 100644
@@ -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

include/configs/TQM862L.h +1 -1

index 0c966c9..d77df9c 100644
@@ -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

include/configs/TQM862M.h +1 -1

index 178e6e2..a6c465b 100644
@@ -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

include/configs/TQM866M.h +1 -1

index a65946d..9ec815c 100644
@@ -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

include/configs/TQM885D.h +1 -1

index 0fc4b69..c715c07 100644
@@ -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

include/configs/ep82xxm.h +1 -1

index c737f10..b52b941 100644
@@ -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 */

include/configs/idmr.h +1 -1

index 61e3bad..8105876 100644
@@ -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"				\

include/configs/keymile-common.h +2 -2

index 3a9f790..6c14ca0 100644
@@ -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" \

include/configs/km8xx.h +1 -1

index b5552d2..a10744e 100644
@@ -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 */

include/configs/v38b.h +1 -1

index d462ed0..600ccfb 100644
@@ -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);"			\

Signature · 1 line

1.6.2.5

Ben Warren

Applied

2010-07-20 21:46 UTC #4 lore raw

PATCH v3 1/1 net ppc: fix ethernet device names with spaces

Hi Heiko,

Quoted 17 lines · Heiko Schocher

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"

Quoted 4 lines

Tested on the kup4k board.
Signed-off-by Heiko Schocher<[email protected]>

Applied to net repo.

thanks,
Ben