projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'testing' into working
[platform/kernel/u-boot.git]
/
net
/
eth.c
diff --git
a/net/eth.c
b/net/eth.c
index
7414d70
..
2330320
100644
(file)
--- a/
net/eth.c
+++ b/
net/eth.c
@@
-26,7
+26,7
@@
#include <net.h>
#include <miiphy.h>
#include <net.h>
#include <miiphy.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET) && defined(CONFIG_NET_MULTI)
+#if
defined(CONFI
G_CMD_NET) && defined(CONFIG_NET_MULTI)
#if defined(CONFIG_SHOW_BOOT_PROGRESS)
# include <status_led.h>
#if defined(CONFIG_SHOW_BOOT_PROGRESS)
# include <status_led.h>
@@
-150,8
+150,7
@@
int eth_initialize(bd_t *bis)
eth_devices = NULL;
eth_current = NULL;
eth_devices = NULL;
eth_current = NULL;
- SHOW_BOOT_PROGRESS(64);
-#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_init();
#endif
miiphy_init();
#endif
@@
-462,7
+461,7
@@
char *eth_get_name (void)
{
return (eth_current ? eth_current->name : "unknown");
}
{
return (eth_current ? eth_current->name : "unknown");
}
-#elif
(CONFIG_COMMANDS & CF
G_CMD_NET) && !defined(CONFIG_NET_MULTI)
+#elif
defined(CONFI
G_CMD_NET) && !defined(CONFIG_NET_MULTI)
extern int at91rm9200_miiphy_initialize(bd_t *bis);
extern int emac4xx_miiphy_initialize(bd_t *bis);
extern int at91rm9200_miiphy_initialize(bd_t *bis);
extern int emac4xx_miiphy_initialize(bd_t *bis);
@@
-471,7
+470,7
@@
extern int ns7520_miiphy_initialize(bd_t *bis);
int eth_initialize(bd_t *bis)
{
int eth_initialize(bd_t *bis)
{
-#if defined(CONFIG_MII) ||
(CONFIG_COMMANDS & CF
G_CMD_MII)
+#if defined(CONFIG_MII) ||
defined(CONFI
G_CMD_MII)
miiphy_init();
#endif
miiphy_init();
#endif