Commit 24790aef authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/xtensa/tags/20160408-xtensa' into staging 



Xtensa-related fixes:

- fix networking on xtfpga platform in linux v4.5 by indicating
  autonegotiation completion in opencores_eth MII BMSR.

# gpg: Signature made Thu 07 Apr 2016 23:33:59 BST using RSA key ID F83FA044
# gpg: Good signature from "Max Filippov <max.filippov@cogentembedded.com>"
# gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>"

* remotes/xtensa/tags/20160408-xtensa:
  opencores_eth: indicate autonegotiation completion

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5542417d 34fe9af0

hw/net/opencores_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void mii_reset(Mii *s) 
{

    memset(s->regs, 0, sizeof(s->regs));

    s->regs[MII_BMCR] = 0x1000;

    s->regs[MII_BMSR] = 0x7848; /* no ext regs */

    s->regs[MII_BMSR] = 0x7868; /* no ext regs */

    s->regs[MII_PHYIDR1] = 0x2000;

    s->regs[MII_PHYIDR2] = 0x5c90;

    s->regs[MII_ANAR] = 0x01e1;