diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-08 11:28:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-08 11:28:49 +0100 |
| commit | 24790aefe03381e47679c9459a3cd0b5e5af751a (patch) | |
| tree | 88e25099dc2def768fa79e1b38435c27800fd299 /hw | |
| parent | 5542417dae2aaa5755ccfaddba4a481c5277e97c (diff) | |
| parent | 34fe9af09b98e849f52bb62c4668a39f1cd8150e (diff) | |
| download | qemu-24790aefe03381e47679c9459a3cd0b5e5af751a.tar.gz | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/opencores_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index 09e239a65a..c6094fbb56 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -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; |