summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-08-10 22:57:54 +0200
committerWolfgang Denk <wd@denx.de>2010-08-10 22:57:54 +0200
commit42441b8a1a3e8b42459de60bbec6833a31cd6cd5 (patch)
treeceaa454a2a57fff3c3a64bf6f1637d61eb54672e /include/configs
parentfc21cd552bf7845fd2002e7a090d53ee5d12d335 (diff)
parentd7fb9bcfb29a1cbdbda7006658e76c2d9da0f66f (diff)
downloadu-boot-imx-42441b8a1a3e8b42459de60bbec6833a31cd6cd5.zip
u-boot-imx-42441b8a1a3e8b42459de60bbec6833a31cd6cd5.tar.gz
u-boot-imx-42441b8a1a3e8b42459de60bbec6833a31cd6cd5.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/MPC8323ERDB.h2
-rw-r--r--include/configs/MPC832XEMDS.h2
-rw-r--r--include/configs/MPC8360EMDS.h2
-rw-r--r--include/configs/MPC8360ERDK.h2
-rw-r--r--include/configs/MPC8568MDS.h2
-rw-r--r--include/configs/MPC8569MDS.h2
-rw-r--r--include/configs/NSCU.h1
-rw-r--r--include/configs/TK885D.h6
-rw-r--r--include/configs/TQM855L.h2
-rw-r--r--include/configs/TQM855M.h2
-rw-r--r--include/configs/TQM860L.h2
-rw-r--r--include/configs/TQM860M.h2
-rw-r--r--include/configs/TQM862L.h2
-rw-r--r--include/configs/TQM862M.h2
-rw-r--r--include/configs/TQM866M.h2
-rw-r--r--include/configs/TQM885D.h2
-rw-r--r--include/configs/ep82xxm.h2
-rw-r--r--include/configs/idmr.h2
-rw-r--r--include/configs/keymile-common.h4
-rw-r--r--include/configs/km8xx.h2
-rw-r--r--include/configs/kmeter1.h2
-rw-r--r--include/configs/v38b.h2
22 files changed, 24 insertions, 25 deletions
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/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/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
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);" \