diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-18 11:18:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-18 11:18:56 -0400 |
| commit | 97c8cb524c19f054036efd2b4429273bd503e39c (patch) | |
| tree | 3cdea4854ba0e8755aff49c43579eb2756ff3349 /drivers/net/e1000.c | |
| parent | a298d4fbcdba1b38e48ea2af0fc5386cab2070da (diff) | |
| parent | 54c321f9deeba309989f0828e4d0427cbfbefcd3 (diff) | |
Merge branch 'network_master' of https://source.denx.de/u-boot/custodians/u-boot-net
Diffstat (limited to 'drivers/net/e1000.c')
| -rw-r--r-- | drivers/net/e1000.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 694114eca79..60613b7df07 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5673,6 +5673,10 @@ static int e1000_write_hwaddr(struct eth_device *dev) DEBUGOUT("%s: mac=%pM\n", __func__, mac); + if ((hw->eeprom.type == e1000_eeprom_invm) && + !(E1000_READ_REG(hw, EECD) & E1000_EECD_FLASH_DETECTED_I210)) + return -ENOSYS; + memset(current_mac, 0, 6); /* Read from EEPROM, not from registers, to make sure |