Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'

[karo-tx-uboot.git] / net / eth.c

diff --git a/net/eth.c b/net/eth.c
index 83d559c120406ab58213bf6ea46202b5a6870913..3aad71f5d35ba0e59e9b0d25f7db8ea86b637577 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -25,6 +25,7 @@
 #include <command.h>
 #include <net.h>
 #include <miiphy.h>
+#include <phy.h>
 
 void eth_parse_enetaddr(const char *addr, uchar *enetaddr)
 {
@@ -102,7 +103,7 @@ struct eth_device *eth_get_dev(void)
        return eth_current;
 }
 
-struct eth_device *eth_get_dev_by_name(char *devname)
+struct eth_device *eth_get_dev_by_name(const char *devname)
 {
        struct eth_device *dev, *target_dev;
 
@@ -166,20 +167,33 @@ int eth_get_dev_index (void)
        return (0);
 }
 
-int eth_register(struct eth_device* dev)
+static void eth_current_changed(void)
 {
-       struct eth_device *d;
-
-       if (!eth_devices) {
-               eth_current = eth_devices = dev;
 #ifdef CONFIG_NET_MULTI
+       {
+               char *act = getenv("ethact");
                /* update current ethernet name */
+               if (eth_current)
                {
-                       char *act = getenv("ethact");
                        if (act == NULL || strcmp(act, eth_current->name) != 0)
                                setenv("ethact", eth_current->name);
                }
+               /*
+                * remove the variable completely if there is no active
+                * interface
+                */
+               else if (act != NULL)
+                       setenv("ethact", NULL);
+       }
 #endif
+}
+
+int eth_register(struct eth_device *dev)
+{
+       struct eth_device *d;
+       if (!eth_devices) {
+               eth_current = eth_devices = dev;
+               eth_current_changed();
        } else {
                for (d=eth_devices; d->next!=eth_devices; d=d->next)
                        ;
@@ -204,10 +218,23 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
        miiphy_init();
 #endif
-       /* Try board-specific initialization first.  If it fails or isn't
-        * present, try the cpu-specific initialization */
-       if (board_eth_init(bis) < 0)
-               cpu_eth_init(bis);
+
+#ifdef CONFIG_PHYLIB
+       phy_init();
+#endif
+
+       /*
+        * If board-specific initialization exists, call it.
+        * If not, call a CPU-specific one
+        */
+       if (board_eth_init != __def_eth_init) {
+               if (board_eth_init(bis) < 0)
+                       printf("Board Net Initialization Failed\n");
+       } else if (cpu_eth_init != __def_eth_init) {
+               if (cpu_eth_init(bis) < 0)
+                       printf("CPU Net Initialization Failed\n");
+       } else
+               printf("Net Initialization Skipped\n");
 
 #if defined(CONFIG_DB64360) || defined(CONFIG_CPCI750)
        mv6436x_eth_initialize(bis);
@@ -234,6 +261,9 @@ int eth_initialize(bd_t *bis)
                                puts (" [PRIME]");
                        }
 
+                       if (strchr(dev->name, ' '))
+                               puts("\nWarning: eth device name has a space!\n");
+
                        eth_getenv_enetaddr_by_index(eth_number, env_enetaddr);
 
                        if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
@@ -260,16 +290,7 @@ int eth_initialize(bd_t *bis)
                        dev = dev->next;
                } while(dev != eth_devices);
 
-#ifdef CONFIG_NET_MULTI
-               /* update current ethernet name */
-               if (eth_current) {
-                       char *act = getenv("ethact");
-                       if (act == NULL || strcmp(act, eth_current->name) != 0)
-                               setenv("ethact", eth_current->name);
-               } else
-                       setenv("ethact", NULL);
-#endif
-
+               eth_current_changed();
                putc ('\n');
        }
 
@@ -457,21 +478,13 @@ void eth_try_another(int first_restart)
 
        eth_current = eth_current->next;
 
-#ifdef CONFIG_NET_MULTI
-       /* update current ethernet name */
-       {
-               char *act = getenv("ethact");
-               if (act == NULL || strcmp(act, eth_current->name) != 0)
-                       setenv("ethact", eth_current->name);
-       }
-#endif
+       eth_current_changed();
 
        if (first_failed == eth_current) {
                NetRestartWrap = 1;
        }
 }
 
-#ifdef CONFIG_NET_MULTI
 void eth_set_current(void)
 {
        static char *act = NULL;
@@ -496,9 +509,8 @@ void eth_set_current(void)
                } while (old_current != eth_current);
        }
 
-       setenv("ethact", eth_current->name);
+       eth_current_changed();
 }
-#endif
 
 char *eth_get_name (void)
 {
@@ -509,7 +521,6 @@ char *eth_get_name (void)
 
 #warning Ethernet driver is deprecated.  Please update to use CONFIG_NET_MULTI
 
-extern int at91rm9200_miiphy_initialize(bd_t *bis);
 extern int mcf52x2_miiphy_initialize(bd_t *bis);
 extern int ns7520_miiphy_initialize(bd_t *bis);
 
@@ -520,9 +531,6 @@ int eth_initialize(bd_t *bis)
        miiphy_init();
 #endif
 
-#if defined(CONFIG_AT91RM9200)
-       at91rm9200_miiphy_initialize(bis);
-#endif
 #if defined(CONFIG_MCF52x2)
        mcf52x2_miiphy_initialize(bis);
 #endif