autoconf.mk.dep: use target cflags, not host

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

diff --git a/net/eth.c b/net/eth.c
index 65238340601bc5a984b2eef59e18f86977b639b7..4280d6dbe77eff5f7e19e445f2a32ad75242e734 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -54,15 +54,14 @@ int eth_setenv_enetaddr(char *name, const uchar *enetaddr)
        return setenv(name, buf);
 }
 
-int eth_getenv_enetaddr_by_index(int index, uchar *enetaddr)
+int eth_getenv_enetaddr_by_index(const char *base_name, int index,
+                                uchar *enetaddr)
 {
        char enetvar[32];
-       sprintf(enetvar, index ? "eth%daddr" : "ethaddr", index);
+       sprintf(enetvar, index ? "%s%daddr" : "%saddr", base_name, index);
        return eth_getenv_enetaddr(enetvar, enetaddr);
 }
 
-#ifdef CONFIG_NET_MULTI
-
 static int eth_mac_skip(int index)
 {
        char enetvar[15];
@@ -107,6 +106,8 @@ struct eth_device *eth_get_dev_by_name(const char *devname)
 {
        struct eth_device *dev, *target_dev;
 
+       BUG_ON(devname == NULL);
+
        if (!eth_devices)
                return NULL;
 
@@ -169,28 +170,58 @@ int eth_get_dev_index (void)
 
 static void eth_current_changed(void)
 {
-#ifdef CONFIG_NET_MULTI
-       {
-               char *act = getenv("ethact");
-               /* update current ethernet name */
-               if (eth_current)
-               {
-                       if (act == NULL || strcmp(act, eth_current->name) != 0)
-                               setenv("ethact", eth_current->name);
+       char *act = getenv("ethact");
+       /* update current ethernet name */
+       if (eth_current) {
+               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);
+}
+
+int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
+                  int eth_number)
+{
+       unsigned char env_enetaddr[6];
+       int ret = 0;
+
+       if (!eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr))
+               return -1;
+
+       if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
+               if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) &&
+                       memcmp(dev->enetaddr, env_enetaddr, 6)) {
+                       printf("\nWarning: %s MAC addresses don't match:\n",
+                               dev->name);
+                       printf("Address in SROM is         %pM\n",
+                               dev->enetaddr);
+                       printf("Address in environment is  %pM\n",
+                               env_enetaddr);
                }
-               /*
-                * remove the variable completely if there is no active
-                * interface
-                */
-               else if (act != NULL)
-                       setenv("ethact", NULL);
+
+               memcpy(dev->enetaddr, env_enetaddr, 6);
        }
-#endif
+
+       if (dev->write_hwaddr &&
+               !eth_mac_skip(eth_number) &&
+               is_valid_ether_addr(dev->enetaddr)) {
+               ret = dev->write_hwaddr(dev);
+       }
+
+       return ret;
 }
 
 int eth_register(struct eth_device *dev)
 {
        struct eth_device *d;
+
+       assert(strlen(dev->name) < NAMESIZE);
+
        if (!eth_devices) {
                eth_current = eth_devices = dev;
                eth_current_changed();
@@ -208,7 +239,6 @@ int eth_register(struct eth_device *dev)
 
 int eth_initialize(bd_t *bis)
 {
-       unsigned char env_enetaddr[6];
        int eth_number = 0;
 
        eth_devices = NULL;
@@ -264,27 +294,8 @@ int eth_initialize(bd_t *bis)
                        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)) {
-                               if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) &&
-                                   memcmp(dev->enetaddr, env_enetaddr, 6))
-                               {
-                                       printf ("\nWarning: %s MAC addresses don't match:\n",
-                                               dev->name);
-                                       printf ("Address in SROM is         %pM\n",
-                                               dev->enetaddr);
-                                       printf ("Address in environment is  %pM\n",
-                                               env_enetaddr);
-                               }
-
-                               memcpy(dev->enetaddr, env_enetaddr, 6);
-                       }
-                       if (dev->write_hwaddr &&
-                               !eth_mac_skip(eth_number) &&
-                               is_valid_ether_addr(dev->enetaddr)) {
-                               dev->write_hwaddr(dev);
-                       }
+                       if (eth_write_hwaddr(dev, "eth", eth_number))
+                               puts("\nWarning: failed to set MAC address\n");
 
                        eth_number++;
                        dev = dev->next;
@@ -359,7 +370,8 @@ int eth_init(bd_t *bis)
        do {
                uchar env_enetaddr[6];
 
-               if (eth_getenv_enetaddr_by_index(eth_number, env_enetaddr))
+               if (eth_getenv_enetaddr_by_index("eth", eth_number,
+                                                env_enetaddr))
                        memcpy(dev->enetaddr, env_enetaddr, 6);
 
                ++eth_number;
@@ -516,31 +528,3 @@ char *eth_get_name (void)
 {
        return (eth_current ? eth_current->name : "unknown");
 }
-
-#else /* !CONFIG_NET_MULTI */
-
-#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);
-
-
-int eth_initialize(bd_t *bis)
-{
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-       miiphy_init();
-#endif
-
-#if defined(CONFIG_AT91RM9200)
-       at91rm9200_miiphy_initialize(bis);
-#endif
-#if defined(CONFIG_MCF52x2)
-       mcf52x2_miiphy_initialize(bis);
-#endif
-#if defined(CONFIG_DRIVER_NS7520_ETHERNET)
-       ns7520_miiphy_initialize(bis);
-#endif
-       return 0;
-}
-#endif