Commit 87a8adc0 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b6df74c4 0ca4f941

hw/pci-host/bonito.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {