diff options
author | Wolfgang Denk <wd@denx.de> | 2010-08-12 23:08:05 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-08-12 23:08:05 +0200 |
commit | ae37a0704a8a27e47471f541a68b88370cd14aa8 (patch) | |
tree | e591e61ff80c3ea1961b37c96e3ad161c8a1f0af /include/configs/TK885D.h | |
parent | 18a056a18f6294a88c34105efcabf4c0638a946b (diff) | |
parent | dc41b8bf3df2b2c3bd833f871d88ff5ef40a19f3 (diff) | |
download | u-boot-imx-ae37a0704a8a27e47471f541a68b88370cd14aa8.zip u-boot-imx-ae37a0704a8a27e47471f541a68b88370cd14aa8.tar.gz u-boot-imx-ae37a0704a8a27e47471f541a68b88370cd14aa8.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'include/configs/TK885D.h')
-rw-r--r-- | include/configs/TK885D.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |