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 with /home/stefan/git/u-boot/u-boot-coldfire-freescale
[platform/kernel/u-boot.git]
/
net
/
eth.c
diff --git
a/net/eth.c
b/net/eth.c
index
a8709f2
..
baf31f0
100644
(file)
--- a/
net/eth.c
+++ b/
net/eth.c
@@
-28,14
+28,6
@@
#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
-#if defined(CONFIG_SHOW_BOOT_PROGRESS)
-# include <status_led.h>
-extern void show_ethcfg_progress (int arg);
-# define SHOW_BOOT_PROGRESS(arg) show_boot_progress (arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-
#ifdef CFG_GT_6426x
extern int gt6426x_eth_initialize(bd_t *bis);
#endif
#ifdef CFG_GT_6426x
extern int gt6426x_eth_initialize(bd_t *bis);
#endif
@@
-151,7
+143,7
@@
int eth_initialize(bd_t *bis)
eth_devices = NULL;
eth_current = NULL;
eth_devices = NULL;
eth_current = NULL;
-
SHOW_BOOT_PROGRESS
(64);
+
show_boot_progress
(64);
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
miiphy_init();
#endif
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
miiphy_init();
#endif
@@
-260,12
+252,12
@@
int eth_initialize(bd_t *bis)
if (!eth_devices) {
puts ("No ethernet found.\n");
if (!eth_devices) {
puts ("No ethernet found.\n");
-
SHOW_BOOT_PROGRESS
(-64);
+
show_boot_progress
(-64);
} else {
struct eth_device *dev = eth_devices;
char *ethprime = getenv ("ethprime");
} else {
struct eth_device *dev = eth_devices;
char *ethprime = getenv ("ethprime");
-
SHOW_BOOT_PROGRESS
(65);
+
show_boot_progress
(65);
do {
if (eth_number)
puts (", ");
do {
if (eth_number)
puts (", ");