Merge branch 'master' of git://git.denx.de/u-boot-ubi

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

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 96f20d1138696d19f747d0f45a90f00ce7542994..1e34436772d3018403c7615331b600dc3595e660 100644 (file)
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -383,6 +383,8 @@ static int configure_phy(struct eth_device *dev)
                priv->address = phy_addr;
        else
                return -1;
+#else
+       phy_addr = priv->address;
 #endif
        if (dw_reset_phy(dev) < 0)
                return -1;
@@ -502,7 +504,7 @@ int designware_initialize(u32 id, ulong base_addr, u32 phy_addr)
        dev->iobase = (int)base_addr;
        dev->priv = priv;
 
-       eth_getenv_enetaddr_by_index(id, &dev->enetaddr[0]);
+       eth_getenv_enetaddr_by_index("eth", id, &dev->enetaddr[0]);
 
        priv->dev = dev;
        priv->mac_regs_p = (struct eth_mac_regs *)base_addr;