Linux/u-boot-bpi-r3
1
0
Fork 0
mirror of https://github.com/frank-w/u-boot.git synced 2026-01-23 01:02:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

net ppc: fix ethernet device names with spaces

Browse Source 
since commit 1384f3bb8a 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@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Heiko Schocher
2010-07-20 17:45:02 +02:00
committed by Ben Warren
parent f699fe1e1f
commit 48690d8024
34 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/configs/NSCU.h
View File

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

6
include/configs/TK885D.h
View File

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

2
include/configs/TQM855L.h
View File

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

2
include/configs/TQM855M.h
View File

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

2
include/configs/TQM860L.h
View File

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

2
include/configs/TQM860M.h
View File

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

2
include/configs/TQM862L.h
View File

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

2
include/configs/TQM862M.h
View File

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

2
include/configs/TQM866M.h
View File

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

2
include/configs/TQM885D.h
View File

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

2
include/configs/ep82xxm.h
View File

@@ -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 */

2
include/configs/idmr.h
View File

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

4
include/configs/keymile-common.h
View File

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

2
include/configs/km8xx.h
View File

@@ -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 */

2
include/configs/v38b.h
View File

@@ -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);" \