colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: mx6: cm-fx6: pass 2nd nic mac addr to Linux

Browse Source 
Obtain 2nd NIC MAC address from baseboard EEPROM and pass it to Linux.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Nikita Kiryanov
2015-01-14 10:42:44 +02:00
committed by Stefano Babic
parent e7a2447ba2
commit eab29802d6
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
board/compulab/cm_fx6/cm_fx6.c
View File

@@ -345,32 +345,36 @@ static iomux_v3_cfg_t const enet_pads[] = {
MUX_PAD_CTRL(ENET_PAD_CTRL)), MUX_PAD_CTRL(ENET_PAD_CTRL)),
}; };
static int handle_mac_address(void) static int handle_mac_address(char *env_var, uint eeprom_bus)
{ {
unsigned char enetaddr[6]; unsigned char enetaddr[6];
int rc; int rc;
rc = eth_getenv_enetaddr("ethaddr", enetaddr); rc = eth_getenv_enetaddr(env_var, enetaddr);
if (rc) if (rc)
return 0; return 0;
rc = cl_eeprom_read_mac_addr(enetaddr, CONFIG_SYS_I2C_EEPROM_BUS); rc = cl_eeprom_read_mac_addr(enetaddr, eeprom_bus);
if (rc) if (rc)
return rc; return rc;
if (!is_valid_ether_addr(enetaddr)) if (!is_valid_ether_addr(enetaddr))
return -1; return -1;
return eth_setenv_enetaddr("ethaddr", enetaddr); return eth_setenv_enetaddr(env_var, enetaddr);
} }
#define SB_FX6_I2C_EEPROM_BUS 0
#define NO_MAC_ADDR "No MAC address found for %s\n"
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
int err; int err;
err = handle_mac_address(); if (handle_mac_address("ethaddr", CONFIG_SYS_I2C_EEPROM_BUS))
if (err) printf(NO_MAC_ADDR, "primary NIC");
puts("No MAC address found\n");
if (handle_mac_address("eth1addr", SB_FX6_I2C_EEPROM_BUS))
printf(NO_MAC_ADDR, "secondary NIC");
SETUP_IOMUX_PADS(enet_pads); SETUP_IOMUX_PADS(enet_pads);
/* phy reset */ /* phy reset */
@@ -469,6 +473,11 @@ int ft_board_setup(void *blob, bd_t *bd)
"local-mac-address", enetaddr, 6, 1); "local-mac-address", enetaddr, 6, 1);
} }
if (eth_getenv_enetaddr("eth1addr", enetaddr)) {
fdt_find_and_setprop(blob, "/eth@pcie", "local-mac-address",
enetaddr, 6, 1);
}
return 0; return 0;
} }
#endif #endif