board/BuR/common: try to setup cpsw mac-address from the devicetree

since we have a dtb blob programmed on the board we try to setup the cpsw
interface with the programmed mac.
If this method fails, we fall back to the device-fuses.

Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
This commit is contained in:
Hannes Petermaier 2015-02-03 13:22:27 +01:00 committed by Tom Rini
parent fbd5aeda48
commit d301425fbf

View file

@ -591,9 +591,9 @@ static struct cpsw_platform_data cpsw_data = {
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
int rv = 0; int rv = 0;
uint8_t mac_addr[6]; char mac_addr[6];
const char *mac = 0;
uint32_t mac_hi, mac_lo; uint32_t mac_hi, mac_lo;
/* try reading mac address from efuse */ /* try reading mac address from efuse */
mac_lo = readl(&cdev->macid0l); mac_lo = readl(&cdev->macid0l);
mac_hi = readl(&cdev->macid0h); mac_hi = readl(&cdev->macid0h);
@ -607,14 +607,19 @@ int board_eth_init(bd_t *bis)
#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
if (!getenv("ethaddr")) { if (!getenv("ethaddr")) {
printf("<ethaddr> not set. Validating first E-fuse MAC ... "); #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_FDT)
printf("<ethaddr> not set. trying DTB ... ");
mac = dtbmacaddr(0);
#endif
if (!mac) {
printf("<ethaddr> not set. validating E-fuse MAC ... ");
if (is_valid_ether_addr((const u8 *)mac_addr))
mac = (const char *)mac_addr;
}
if (is_valid_ether_addr(mac_addr)) { if (mac) {
printf("using: %02X:%02X:%02X:%02X:%02X:%02X.\n", printf("using: %pM on ", mac);
mac_addr[0], mac_addr[1], mac_addr[2], eth_setenv_enetaddr("ethaddr", (const u8 *)mac);
mac_addr[3], mac_addr[4], mac_addr[5]
);
eth_setenv_enetaddr("ethaddr", mac_addr);
} }
} }
writel(MII_MODE_ENABLE, &cdev->miisel); writel(MII_MODE_ENABLE, &cdev->miisel);