diff options
author | Tom Rini <trini@ti.com> | 2014-03-10 18:22:54 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-03-10 18:22:54 (GMT) |
commit | 5495dae7aa9d5cd161e07174d38acac86515c58a (patch) | |
tree | 848c7f48688aeb5ada1fe221dc5dff4729561814 /board/ti/dra7xx/evm.c | |
parent | c0d297946fd2540c8057eb1589429978da888dbb (diff) | |
parent | 27019e4a949fc3be2e895ac20839c4d4d119f902 (diff) | |
download | u-boot-fsl-qoriq-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/ti/dra7xx/evm.c')
-rw-r--r-- | board/ti/dra7xx/evm.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index bed8285..c6c4fd1 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -149,12 +149,12 @@ static struct cpsw_slave_data cpsw_slaves[] = { { .slave_reg_ofs = 0x208, .sliver_reg_ofs = 0xd80, - .phy_id = 0, + .phy_addr = 2, }, { .slave_reg_ofs = 0x308, .sliver_reg_ofs = 0xdc0, - .phy_id = 1, + .phy_addr = 3, }, }; @@ -216,6 +216,21 @@ int board_eth_init(bd_t *bis) if (is_valid_ether_addr(mac_addr)) eth_setenv_enetaddr("ethaddr", mac_addr); } + + mac_lo = readl((*ctrl)->control_core_mac_id_1_lo); + mac_hi = readl((*ctrl)->control_core_mac_id_1_hi); + mac_addr[0] = (mac_hi & 0xFF0000) >> 16; + mac_addr[1] = (mac_hi & 0xFF00) >> 8; + mac_addr[2] = mac_hi & 0xFF; + mac_addr[3] = (mac_lo & 0xFF0000) >> 16; + mac_addr[4] = (mac_lo & 0xFF00) >> 8; + mac_addr[5] = mac_lo & 0xFF; + + if (!getenv("eth1addr")) { + if (is_valid_ether_addr(mac_addr)) + eth_setenv_enetaddr("eth1addr", mac_addr); + } + ctrl_val = readl((*ctrl)->control_core_control_io1) & (~0x33); ctrl_val |= 0x22; writel(ctrl_val, (*ctrl)->control_core_control_io1); |