Commit c532b954 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * target/arm: avoid undefined behaviour shift in watchpoint code
 * target/arm: avoid undefined behaviour shift in handle_simd_dupe()
 * target/arm: add assert that immh != 0 in disas_simd_shift_imm()
 * aspeed/smc: Fix DMA support for AST2600
 * hw/arm/bcm283x: Correct the license text ('and' vs 'or')

# gpg: Signature made Mon 23 Mar 2020 17:38:59 GMT
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20200323:
  target/arm: Move computation of index in handle_simd_dupe
  target/arm: Assert immh != 0 in disas_simd_shift_imm
  target/arm: Rearrange disabled check for watchpoints
  aspeed/smc: Fix DMA support for AST2600
  hw/arm/bcm283x: Correct the license text

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 787f8240 550a0489

hw/arm/aspeed_ast2600.c

+6 −0
Original line number Diff line number Diff line
@@ -411,6 +411,12 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) 


    /* SPI */

    for (i = 0; i < sc->spis_num; i++) {

        object_property_set_link(OBJECT(&s->spi[i]), OBJECT(s->dram_mr),

                                 "dram", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

        object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err);

        object_property_set_bool(OBJECT(&s->spi[i]), true, "realized",

                                 &local_err);

hw/arm/bcm2835_peripherals.c

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
 * Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft

 * Written by Andrew Baumann

 *

 * This code is licensed under the GNU GPLv2 and later.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

hw/arm/bcm2836.c

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
 * Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft

 * Written by Andrew Baumann

 *

 * This code is licensed under the GNU GPLv2 and later.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

hw/arm/raspi.c

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
 * Raspberry Pi 3 emulation Copyright (c) 2018 Zoltán Baldaszti

 * Upstream code cleanup (c) 2018 Pekka Enberg

 *

 * This code is licensed under the GNU GPLv2 and later.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

hw/display/bcm2835_fb.c

+0 −1
Original line number Diff line number Diff line 
/*

 * Raspberry Pi emulation (c) 2012 Gregory Estrade

 * Refactoring for Pi2 Copyright (c) 2015, Microsoft. Written by Andrew Baumann.

 * This code is licensed under the GNU GPLv2 and later.

 *

 * Heavily based on milkymist-vgafb.c, copyright terms below:

 *  QEMU model of the Milkymist VGA framebuffer.