Commit 82b2865e authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * remove "bag of random stuff" hw/devices.h header
 * implement FPU for Cortex-M and enable it for Cortex-M4 and -M33
 * hw/dma: Compile the bcm2835_dma device as common object
 * configure: Remove --source-path option
 * hw/ssi/xilinx_spips: Avoid variable length array
 * hw/arm/smmuv3: Remove SMMUNotifierNode

# gpg: Signature made Mon 29 Apr 2019 17:58:57 BST
# 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-20190429: (42 commits)
  hw/devices: Move SMSC 91C111 declaration into a new header
  hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string
  hw/net/ne2000-isa: Add guards to the header
  hw/devices: Move LAN9118 declarations into a new header
  hw/devices: Move TI touchscreen declarations into a new header
  hw/devices: Move Gamepad declarations into a new header
  hw/devices: Move CBus declarations into a new header
  hw/devices: Move Blizzard declarations into a new header
  hw/devices: Move TC6393XB declarations into a new header
  hw/display/tc6393xb: Remove unused functions
  hw/arm/nseries: Use TYPE_TMP105 instead of hardcoded string
  hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string
  hw/dma: Compile the bcm2835_dma device as common object
  target/arm: Enable FPU for Cortex-M4 and Cortex-M33
  target/arm: Implement VLLDM for v7M CPUs with an FPU
  target/arm: Implement VLSTM for v7M CPUs with an FPU
  target/arm: Implement M-profile lazy FP state preservation
  target/arm: Add lazy-FP-stacking support to v7m_stack_write()
  target/arm: New function armv7m_nvic_set_pending_lazyfp()
  target/arm: New helper function arm_v7m_mmu_idx_all()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 413a99a9 437cc27d

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -663,10 +663,14 @@ M: Peter Maydell <peter.maydell@linaro.org> 
L: qemu-arm@nongnu.org

S: Odd Fixes

F: hw/arm/nseries.c

F: hw/display/blizzard.c

F: hw/input/lm832x.c

F: hw/input/tsc2005.c

F: hw/misc/cbus.c

F: hw/timer/twl92230.c

F: include/hw/display/blizzard.h

F: include/hw/input/tsc2xxx.h

F: include/hw/misc/cbus.h



Palm

M: Andrzej Zaborowski <balrogg@gmail.com>
@@ -675,6 +679,7 @@ L: qemu-arm@nongnu.org 
S: Odd Fixes

F: hw/arm/palm.c

F: hw/input/tsc210x.c

F: include/hw/input/tsc2xxx.h



Raspberry Pi

M: Peter Maydell <peter.maydell@linaro.org>
@@ -714,6 +719,7 @@ F: hw/misc/mst_fpga.c 
F: hw/misc/max111x.c

F: include/hw/arm/pxa.h

F: include/hw/arm/sharpsl.h

F: include/hw/display/tc6393xb.h



SABRELITE / i.MX6

M: Peter Maydell <peter.maydell@linaro.org>
@@ -740,6 +746,7 @@ M: Peter Maydell <peter.maydell@linaro.org> 
L: qemu-arm@nongnu.org

S: Maintained

F: hw/*/stellaris*

F: include/hw/input/gamepad.h



Versatile Express

M: Peter Maydell <peter.maydell@linaro.org>

configure

+2 −8
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ ld_has() { 


# default parameters

source_path=$(dirname "$0")

# make source path absolute

source_path=$(cd "$source_path"; pwd)

cpu=""

iasl="iasl"

interp_prefix="/usr/gnemul/qemu-%M"
@@ -520,8 +522,6 @@ for opt do 
  ;;

  --cxx=*) CXX="$optarg"

  ;;

  --source-path=*) source_path="$optarg"

  ;;

  --cpu=*) cpu="$optarg"

  ;;

  --extra-cflags=*) QEMU_CFLAGS="$QEMU_CFLAGS $optarg"
@@ -600,9 +600,6 @@ if test "$debug_info" = "yes"; then 
    LDFLAGS="-g $LDFLAGS"

fi



# make source path absolute

source_path=$(cd "$source_path"; pwd)



# running configure in the source tree?

# we know that's the case if configure is there.

if test -f "./configure"; then
@@ -946,8 +943,6 @@ for opt do 
  ;;

  --interp-prefix=*) interp_prefix="$optarg"

  ;;

  --source-path=*)

  ;;

  --cross-prefix=*)

  ;;

  --cc=*)
@@ -1651,7 +1646,6 @@ $(echo Available targets: $default_target_list | \ 
  --target-list-exclude=LIST exclude a set of targets from the default target-list



Advanced options (experts only):

  --source-path=PATH       path of source code [$source_path]

  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]

  --cc=CC                  use C compiler CC [$cc]

  --iasl=IASL              use ACPI compiler IASL [$iasl]

hw/arm/aspeed.c

+9 −4
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include "hw/arm/aspeed_soc.h"

#include "hw/boards.h"

#include "hw/i2c/smbus_eeprom.h"

#include "hw/misc/pca9552.h"

#include "hw/misc/tmp105.h"

#include "qemu/log.h"

#include "sysemu/block-backend.h"

#include "hw/loader.h"
@@ -267,7 +269,8 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc) 
                          eeprom_buf);



    /* The AST2500 EVB expects a LM75 but a TMP105 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7), "tmp105", 0x4d);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7),

                     TYPE_TMP105, 0x4d);



    /* The AST2500 EVB does not have an RTC. Let's pretend that one is

     * plugged on the I2C bus header */
@@ -288,13 +291,15 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc) 
    AspeedSoCState *soc = &bmc->soc;

    uint8_t *eeprom_buf = g_malloc0(8 * 1024);



    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), "pca9552", 0x60);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), TYPE_PCA9552,

                     0x60);



    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "tmp423", 0x4c);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 5), "tmp423", 0x4c);



    /* The Witherspoon expects a TMP275 but a TMP105 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), "tmp105", 0x4a);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), TYPE_TMP105,

                     0x4a);



    /* The witherspoon board expects Epson RX8900 I2C RTC but a ds1338 is

     * good enough */
@@ -302,7 +307,7 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc) 


    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), 0x51,

                          eeprom_buf);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "pca9552",

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), TYPE_PCA9552,

                     0x60);

}

hw/arm/exynos4_boards.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "hw/arm/arm.h"

#include "exec/address-spaces.h"

#include "hw/arm/exynos4210.h"

#include "hw/net/lan9118.h"

#include "hw/boards.h"



#undef DEBUG
@@ -92,7 +93,7 @@ static void lan9215_init(uint32_t base, qemu_irq irq) 
    /* This should be a 9215 but the 9118 is close enough */

    if (nd_table[0].used) {

        qemu_check_nic_model(&nd_table[0], "lan9118");

        dev = qdev_create(NULL, "lan9118");

        dev = qdev_create(NULL, TYPE_LAN9118);

        qdev_set_nic_properties(dev, &nd_table[0]);

        qdev_prop_set_uint32(dev, "mode_16bit", 1);

        qdev_init_nofail(dev);

hw/arm/gumstix.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include "hw/arm/pxa.h"

#include "net/net.h"

#include "hw/block/flash.h"

#include "hw/devices.h"

#include "hw/net/smc91c111.h"

#include "hw/boards.h"

#include "exec/address-spaces.h"

#include "sysemu/qtest.h"