From a35aa5a0c1159a2c19141272375123a954a7f287 Mon Sep 17 00:00:00 2001 From: Hanyuan Zhao Date: Fri, 9 Aug 2024 16:56:55 +0800 Subject: [PATCH] net: dc2114x: get mac address from environment Let this old driver work like the other newer network card drivers, loading the MAC address from environment, which could be more flexible to set. Signed-off-by: Hanyuan Zhao --- drivers/net/dc2114x.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 3704d2e655..7f0715429f 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -478,8 +478,16 @@ static int dc2114x_start(struct udevice *dev) { struct eth_pdata *plat = dev_get_plat(dev); struct dc2114x_priv *priv = dev_get_priv(dev); + int rval; - memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); + if(!priv->enetaddr) { + rval = eth_env_get_enetaddr("ethaddr", priv->enetaddr); + + if (!rval) { + printf("dc2114x: Err: please set a valid MAC address\n"); + return -EINVAL; + } + } #if !CONFIG_IS_ENABLED(TULIP_SUPPORT_NON_PCI) /* Ensure we're not sleeping. */ @@ -574,9 +582,6 @@ static int dc2114x_probe(struct udevice *dev) iobase &= ~0xf; debug("dc2114x: DEC 2114x PCI Device @0x%x\n", iobase); - - priv->devno = dev; - priv->enetaddr = plat->enetaddr; priv->iobase = (void __iomem *)dm_pci_mem_to_phys(dev, iobase); command = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER; @@ -589,6 +594,9 @@ static int dc2114x_probe(struct udevice *dev) dm_pci_write_config8(dev, PCI_LATENCY_TIMER, 0x60); #endif + + priv->devno = dev; + priv->enetaddr = plat->enetaddr; return 0; } -- 2.39.5