env: Rename eth_getenv_enetaddr() to eth_env_get_enetaddr()

[u-boot] / drivers / net / sh_eth.c

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 4bf493ed4532688bd5c8f40cd80e04b1cea4bc4e..970d730e5622e3ba6554843c97806ec8d1146f34 100644 (file)
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -1,5 +1,5 @@
 /*
- * sh_eth.c - Driver for Renesas ethernet controler.
+ * sh_eth.c - Driver for Renesas ethernet controller.
  *
  * Copyright (C) 2008, 2011 Renesas Solutions Corp.
  * Copyright (c) 2008, 2011, 2014 2014 Nobuhiro Iwamatsu
@@ -15,7 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <miiphy.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 
 #include "sh_eth.h"
@@ -127,7 +127,7 @@ int sh_eth_recv(struct eth_device *dev)
                        packet = (uchar *)
                                ADDR_TO_P2(port_info->rx_desc_cur->rd2);
                        invalidate_cache(packet, len);
-                       NetReceive(packet, len);
+                       net_process_received_packet(packet, len);
                }
 
                /* Make current descriptor available again */
@@ -560,15 +560,25 @@ int sh_eth_initialize(bd_t *bd)
        dev->recv = sh_eth_recv;
        eth->port_info[eth->port].dev = dev;
 
-       sprintf(dev->name, SHETHER_NAME);
+       strcpy(dev->name, SHETHER_NAME);
 
        /* Register Device to EtherNet subsystem  */
        eth_register(dev);
 
        bb_miiphy_buses[0].priv = eth;
-       miiphy_register(dev->name, bb_miiphy_read, bb_miiphy_write);
-
-       if (!eth_getenv_enetaddr("ethaddr", dev->enetaddr))
+       int retval;
+       struct mii_dev *mdiodev = mdio_alloc();
+       if (!mdiodev)
+               return -ENOMEM;
+       strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
+       mdiodev->read = bb_miiphy_read;
+       mdiodev->write = bb_miiphy_write;
+
+       retval = mdio_register(mdiodev);
+       if (retval < 0)
+               return retval;
+
+       if (!eth_env_get_enetaddr("ethaddr", dev->enetaddr))
                puts("Please set MAC address\n");
 
        return ret;