mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-02 09:46:37 +03:00
board: dhelectronics: imx: Use second Ethernet MAC also from fuse
Currently, the board specific code evaluates only the first Ethernet MAC address fuse, regardless of whether the first or second MAC address is requested. When the function to determine the second Ethernet MAC address is looking for the fused MAC address, it only reads the first MAC address fuse and increment it by one to set the second Ethernet MAC address. That is not the expected behavior when two MAC addresses are fused, because this causes the second fused MAC address to be ignored. Change this so that the second fused MAC address will be used. Reviewed-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com> Reviewed-by: Marek Vasut <marex@nabladev.com>
This commit is contained in:
committed by
Fabio Estevam
parent
e7e35b85de
commit
69d4387575
@@ -10,13 +10,13 @@
|
||||
#include <net.h>
|
||||
#include "dh_imx.h"
|
||||
|
||||
int dh_imx_get_mac_from_fuse(unsigned char *enetaddr)
|
||||
int dh_imx_get_mac_from_fuse(unsigned char *enetaddr, int index)
|
||||
{
|
||||
/*
|
||||
* If IIM fuses contain valid MAC address, use it.
|
||||
* The IIM MAC address fuses are NOT programmed by default.
|
||||
*/
|
||||
imx_get_mac_from_fuse(0, enetaddr);
|
||||
imx_get_mac_from_fuse(index, enetaddr);
|
||||
if (!is_valid_ethaddr(enetaddr))
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
* dh_imx_get_mac_from_fuse - Get MAC address from fuse and write it to env
|
||||
*
|
||||
* @enetaddr: buffer where address is to be stored
|
||||
* @index: index of MAC address in fuse (starts with 0)
|
||||
* Return: 0 if OK, other value on error
|
||||
*/
|
||||
int dh_imx_get_mac_from_fuse(unsigned char *enetaddr);
|
||||
int dh_imx_get_mac_from_fuse(unsigned char *enetaddr, int index);
|
||||
|
||||
@@ -94,7 +94,7 @@ int dh_setup_mac_address(struct eeprom_id_page *eip)
|
||||
if (dh_get_mac_is_enabled("ethernet0"))
|
||||
return 0;
|
||||
|
||||
if (!dh_imx_get_mac_from_fuse(enetaddr))
|
||||
if (!dh_imx_get_mac_from_fuse(enetaddr, 0))
|
||||
goto out;
|
||||
|
||||
if (!dh_get_mac_from_eeprom(enetaddr, "eeprom0"))
|
||||
|
||||
@@ -47,7 +47,7 @@ static int dh_imx8_setup_ethaddr(struct eeprom_id_page *eip)
|
||||
if (dh_get_mac_is_enabled("ethernet0"))
|
||||
return 0;
|
||||
|
||||
if (!dh_imx_get_mac_from_fuse(enetaddr))
|
||||
if (!dh_imx_get_mac_from_fuse(enetaddr, 0))
|
||||
goto out;
|
||||
|
||||
if (!dh_get_value_from_eeprom_buffer(DH_MAC0, enetaddr, sizeof(enetaddr), eip))
|
||||
@@ -72,8 +72,8 @@ static int dh_imx8_setup_eth1addr(struct eeprom_id_page *eip)
|
||||
if (dh_get_mac_is_enabled("ethernet1"))
|
||||
return 0;
|
||||
|
||||
if (!dh_imx_get_mac_from_fuse(enetaddr))
|
||||
goto increment_out;
|
||||
if (!dh_imx_get_mac_from_fuse(enetaddr, 1))
|
||||
goto out;
|
||||
|
||||
if (!dh_get_value_from_eeprom_buffer(DH_MAC1, enetaddr, sizeof(enetaddr), eip))
|
||||
goto out;
|
||||
|
||||
Reference in New Issue
Block a user