dt: bcm968580xref: enable nand controller

[oweals/u-boot.git] / net / eth_legacy.c

diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index bdcd6eaafccc99f11918e981aaddde61b1c832e9..e250a430f333aa66d1774346377efdc93b908d3f 100644 (file)
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001-2015
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  * Joe Hershberger, National Instruments
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -11,7 +10,7 @@
 #include <environment.h>
 #include <net.h>
 #include <phy.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include "eth_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -118,9 +117,10 @@ static int on_ethaddr(const char *name, const char *value, enum env_op op,
                        case env_op_create:
                        case env_op_overwrite:
                                eth_parse_enetaddr(value, dev->enetaddr);
+                               eth_write_hwaddr(dev, "eth", dev->index);
                                break;
                        case env_op_delete:
-                               memset(dev->enetaddr, 0, 6);
+                               memset(dev->enetaddr, 0, ARP_HLEN);
                        }
                }
                dev = dev->next;
@@ -133,14 +133,14 @@ U_BOOT_ENV_CALLBACK(ethaddr, on_ethaddr);
 int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
                   int eth_number)
 {
-       unsigned char env_enetaddr[6];
+       unsigned char env_enetaddr[ARP_HLEN];
        int ret = 0;
 
-       eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr);
+       eth_env_get_enetaddr_by_index(base_name, eth_number, env_enetaddr);
 
        if (!is_zero_ethaddr(env_enetaddr)) {
                if (!is_zero_ethaddr(dev->enetaddr) &&
-                   memcmp(dev->enetaddr, env_enetaddr, 6)) {
+                   memcmp(dev->enetaddr, env_enetaddr, ARP_HLEN)) {
                        printf("\nWarning: %s MAC addresses don't match:\n",
                               dev->name);
                        printf("Address in SROM is         %pM\n",
@@ -149,10 +149,10 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
                               env_enetaddr);
                }
 
-               memcpy(dev->enetaddr, env_enetaddr, 6);
+               memcpy(dev->enetaddr, env_enetaddr, ARP_HLEN);
        } else if (is_valid_ethaddr(dev->enetaddr)) {
-               eth_setenv_enetaddr_by_index(base_name, eth_number,
-                                            dev->enetaddr);
+               eth_env_set_enetaddr_by_index(base_name, eth_number,
+                                             dev->enetaddr);
        } else if (is_zero_ethaddr(dev->enetaddr)) {
 #ifdef CONFIG_NET_RANDOM_ETHADDR
                net_random_ethaddr(dev->enetaddr);
@@ -260,7 +260,7 @@ int eth_initialize(void)
                bootstage_error(BOOTSTAGE_ID_NET_ETH_START);
        } else {
                struct eth_device *dev = eth_devices;
-               char *ethprime = getenv("ethprime");
+               char *ethprime = env_get("ethprime");
 
                bootstage_mark(BOOTSTAGE_ID_NET_ETH_INIT);
                do {
@@ -291,14 +291,13 @@ int eth_initialize(void)
        return num_devices;
 }
 
-#ifdef CONFIG_MCAST_TFTP
 /* Multicast.
  * mcast_addr: multicast ipaddr from which multicast Mac is made
  * join: 1=join, 0=leave.
  */
 int eth_mcast_join(struct in_addr mcast_ip, int join)
 {
-       u8 mcast_mac[6];
+       u8 mcast_mac[ARP_HLEN];
        if (!eth_current || !eth_current->mcast)
                return -1;
        mcast_mac[5] = htonl(mcast_ip.s_addr) & 0xff;
@@ -310,33 +309,6 @@ int eth_mcast_join(struct in_addr mcast_ip, int join)
        return eth_current->mcast(eth_current, mcast_mac, join);
 }
 
-/* the 'way' for ethernet-CRC-32. Spliced in from Linux lib/crc32.c
- * and this is the ethernet-crc method needed for TSEC -- and perhaps
- * some other adapter -- hash tables
- */
-#define CRCPOLY_LE 0xedb88320
-u32 ether_crc(size_t len, unsigned char const *p)
-{
-       int i;
-       u32 crc;
-       crc = ~0;
-       while (len--) {
-               crc ^= *p++;
-               for (i = 0; i < 8; i++)
-                       crc = (crc >> 1) ^ ((crc & 1) ? CRCPOLY_LE : 0);
-       }
-       /* an reverse the bits, cuz of way they arrive -- last-first */
-       crc = (crc >> 16) | (crc << 16);
-       crc = (crc >> 8 & 0x00ff00ff) | (crc << 8 & 0xff00ff00);
-       crc = (crc >> 4 & 0x0f0f0f0f) | (crc << 4 & 0xf0f0f0f0);
-       crc = (crc >> 2 & 0x33333333) | (crc << 2 & 0xcccccccc);
-       crc = (crc >> 1 & 0x55555555) | (crc << 1 & 0xaaaaaaaa);
-       return crc;
-}
-
-#endif
-
-
 int eth_init(void)
 {
        struct eth_device *old_current;