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

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



target-arm queue:
 * Fixes for various bugs in SVE instructions
 * Add model of Freescale i.MX6 UltraLite 14x14 EVK Board
 * hw/arm: make bitbanded IO optional on ARMv7-M
 * Add model of Cortex-M0 CPU
 * Add support for loading Intel HEX files to the generic loader
 * imx_spi: Unset XCH when TX FIFO becomes empty
 * aspeed_sdmc: fix various bugs
 * Fix bugs in Arm FP16 instruction support
 * Fix aa64 FCADD and FCMLA decode
 * softfloat: Fix missing inexact for floating-point add
 * hw/arm/mps2-tz: Replace init_sysbus_child() with sysbus_init_child_obj()

# gpg: Signature made Thu 16 Aug 2018 14:33:41 BST
# gpg:                using RSA key 3C2525ED14360CDE
# 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-20180816: (30 commits)
  hw/arm/mps2-tz: Replace init_sysbus_child() with sysbus_init_child_obj()
  softfloat: Fix missing inexact for floating-point add
  target/arm: Fix aa64 FCADD and FCMLA decode
  target/arm: Use FZ not FZ16 for SVE FCVT single-half and double-half
  target/arm: Use fp_status_fp16 for do_fmpa_zpzzz_h
  target/arm: Ignore float_flag_input_denormal from fp_status_f16
  target/arm: Adjust FPCR_MASK for FZ16
  aspeed: add a max_ram_size property to the memory controller
  aspeed_sdmc: Handle ECC training
  aspeed_sdmc: Init status always idle
  aspeed_sdmc: Set 'cache initial sequence' always true
  aspeed_sdmc: Fix saved values
  aspeed_sdmc: Extend number of valid registers
  imx_spi: Unset XCH when TX FIFO becomes empty
  Add QTest testcase for the Intel Hexadecimal
  loader: Implement .hex file loader
  loader: add rom transaction API
  loader: extract rom_free() function
  target/arm: add "cortex-m0" CPU model
  hw/arm: make bitbanded IO optional on ARMv7-M
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c542a9f9 fcf13ca5

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1323,6 +1323,12 @@ F: hw/core/generic-loader.c 
F: include/hw/core/generic-loader.h

F: docs/generic-loader.txt



Intel Hexadecimal Object File Loader

M: Su Hang <suhang16@mails.ucas.ac.cn>

S: Maintained

F: tests/hexloader-test.c

F: tests/hex-loader-check-data/test.hex



CHRP NVRAM

M: Thomas Huth <thuth@redhat.com>

S: Maintained

configure

+4 −0
Original line number Diff line number Diff line
@@ -7382,6 +7382,10 @@ for test_file in $(find $source_path/tests/acpi-test-data -type f) 
do

    FILES="$FILES tests/acpi-test-data$(echo $test_file | sed -e 's/.*acpi-test-data//')"

done

for test_file in $(find $source_path/tests/hex-loader-check-data -type f)

do

    FILES="$FILES tests/hex-loader-check-data$(echo $test_file | sed -e 's/.*hex-loader-check-data//')"

done

mkdir -p $DIRS

for f in $FILES ; do

    if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" != "y" ]; then

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ CONFIG_FSL_IMX6=y 
CONFIG_FSL_IMX31=y

CONFIG_FSL_IMX25=y

CONFIG_FSL_IMX7=y

CONFIG_FSL_IMX6UL=y



CONFIG_IMX_I2C=y

fpu/softfloat.c

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ static FloatParts addsub_floats(FloatParts a, FloatParts b, bool subtract, 
            }

            a.frac += b.frac;

            if (a.frac & DECOMPOSED_OVERFLOW_BIT) {

                a.frac >>= 1;

                shift64RightJamming(a.frac, 1, &a.frac);

                a.exp += 1;

            }

            return a;

hw/arm/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -36,3 +36,4 @@ obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o 
obj-$(CONFIG_IOTKIT) += iotkit.o

obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o

obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o

obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o