diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-17 12:54:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-17 12:54:46 +0100 |
| commit | 87a8adc0876c11a434d3ecdfb10cd797259ddaaa (patch) | |
| tree | beb9ef12d5bdb6fef73f2b24bc45c3effb514879 | |
| parent | b6df74c46528646f3163890cf16b74af551c3494 (diff) | |
| parent | 0ca4f94195cce77b624edc6d9abcf14a3bf01f06 (diff) | |
| download | qemu-87a8adc0876c11a434d3ecdfb10cd797259ddaaa.tar.gz | |
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150417-2' into staging
MIPS patches 2015-04-17
Changes:
* fix broken fulong2e
# gpg: Signature made Fri Apr 17 12:14:37 2015 BST using RSA key ID 0B29DA6B
# gpg: Can't check signature: public key not found
* remotes/lalrae/tags/mips-20150417-2:
mips: fix broken fulong2e machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/pci-host/bonito.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 8bdd56922a..8134d0bcd0 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -233,7 +233,7 @@ static void bonito_writel(void *opaque, hwaddr addr, uint32_t saddr; int reset = 0; - saddr = (addr - BONITO_REGBASE) >> 2; + saddr = addr >> 2; DPRINTF("bonito_writel "TARGET_FMT_plx" val %x saddr %x\n", addr, val, saddr); switch (saddr) { @@ -295,7 +295,7 @@ static uint64_t bonito_readl(void *opaque, hwaddr addr, PCIBonitoState *s = opaque; uint32_t saddr; - saddr = (addr - BONITO_REGBASE) >> 2; + saddr = addr >> 2; DPRINTF("bonito_readl "TARGET_FMT_plx"\n", addr); switch (saddr) { |