Commit 4f4a9ca4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160707' into staging 



target-arm queue:
 * fix a wrong variable type for A64 SYS_HEAPINFO semihosting call
 * xlnx_dp: fix iffy xlnx_dp_aux_push_tx_fifo
 * aux: fix break that wanted to break two levels out
 * aux: Rename aux.[ch] to auxbus.[ch] for the benefit of Windows
 * hw/block/m25p80: fix resource leak
 * i.MX: split the GPT timer implementation into per SOC definitions

# gpg: Signature made Thu 07 Jul 2016 14:48:09 BST
# gpg:                using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20160707:
  i.MX: split the GPT timer implementation into per SOC definitions
  hw/block/m25p80: fix resource leak
  aux: Rename aux.[ch] to auxbus.[ch] for the benefit of Windows
  aux: fix break that wanted to break two levels out
  xlnx_dp: fix iffy xlnx_dp_aux_push_tx_fifo
  target-arm/arm-semi.c: In SYS_HEAPINFO use correct type for 'limit'

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5563168c 66542f63

hw/arm/fsl-imx25.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void fsl_imx25_init(Object *obj) 
    }



    for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {

        object_initialize(&s->gpt[i], sizeof(s->gpt[i]), TYPE_IMX_GPT);

        object_initialize(&s->gpt[i], sizeof(s->gpt[i]), TYPE_IMX25_GPT);

        qdev_set_parent_bus(DEVICE(&s->gpt[i]), sysbus_get_default());

    }

hw/arm/fsl-imx31.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void fsl_imx31_init(Object *obj) 
        qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default());

    }



    object_initialize(&s->gpt, sizeof(s->gpt), TYPE_IMX_GPT);

    object_initialize(&s->gpt, sizeof(s->gpt), TYPE_IMX31_GPT);

    qdev_set_parent_bus(DEVICE(&s->gpt), sysbus_get_default());



    for (i = 0; i < FSL_IMX31_NUM_EPITS; i++) {

hw/arm/fsl-imx6.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void fsl_imx6_init(Object *obj) 
        object_property_add_child(obj, name, OBJECT(&s->uart[i]), NULL);

    }



    object_initialize(&s->gpt, sizeof(s->gpt), TYPE_IMX_GPT);

    object_initialize(&s->gpt, sizeof(s->gpt), TYPE_IMX6_GPT);

    qdev_set_parent_bus(DEVICE(&s->gpt), sysbus_get_default());

    object_property_add_child(obj, "gpt", OBJECT(&s->gpt), NULL);

hw/block/m25p80.c

+4 −2
Original line number Diff line number Diff line
@@ -459,12 +459,13 @@ static void blk_sync_complete(void *opaque, int ret) 


static void flash_sync_page(Flash *s, int page)

{

    QEMUIOVector *iov = g_new(QEMUIOVector, 1);

    QEMUIOVector *iov;



    if (!s->blk || blk_is_read_only(s->blk)) {

        return;

    }



    iov = g_new(QEMUIOVector, 1);

    qemu_iovec_init(iov, 1);

    qemu_iovec_add(iov, s->storage + page * s->pi->page_size,

                   s->pi->page_size);
@@ -474,13 +475,14 @@ static void flash_sync_page(Flash *s, int page) 


static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)

{

    QEMUIOVector *iov = g_new(QEMUIOVector, 1);

    QEMUIOVector *iov;



    if (!s->blk || blk_is_read_only(s->blk)) {

        return;

    }



    assert(!(len % BDRV_SECTOR_SIZE));

    iov = g_new(QEMUIOVector, 1);

    qemu_iovec_init(iov, 1);

    qemu_iovec_add(iov, s->storage + off, len);

    blk_aio_pwritev(s->blk, off, iov, 0, blk_sync_complete, iov);

hw/display/dpcd.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


#include "qemu/osdep.h"

#include "qemu/log.h"

#include "hw/misc/aux.h"

#include "hw/misc/auxbus.h"

#include "hw/display/dpcd.h"



#ifndef DEBUG_DPCD