From 48690d8024eeeaee3120db702e54fcb238e6d9c7 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Tue, 20 Jul 2010 17:45:02 +0200 Subject: net ppc: fix ethernet device names with spaces 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 Signed-off-by: Ben Warren --- doc/uImage.FIT/howto.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/uImage.FIT/howto.txt b/doc/uImage.FIT/howto.txt index 8065e9e1d8d..59e21e91e34 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 -- cgit v1.2.3 From 78b7a8ef8b37582a37a5c2381191061380b42831 Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Mon, 26 Jul 2010 18:34:57 -0500 Subject: 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 Acked-by: Dave Liu Signed-off-by: Ben Warren --- doc/README.kmeter1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/README.kmeter1 b/doc/README.kmeter1 index 44ebb7a7811..7f4fc999f8f 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 -- cgit v1.2.3