aboutsummaryrefslogtreecommitdiff
path: root/tests/qapi-schema/alternate-conflict-dict.err
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-09-30 11:02:22 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-09-30 11:02:22 +0100
commit786d36ad416c6c199b18b78cc31eddfb784fe15d (patch)
tree5df78ee8c2a61247a609bfd25e0b3fcdaf2aa48e /tests/qapi-schema/alternate-conflict-dict.err
parent1e396381939bb7e4e799d9bf2a2af693954b5613 (diff)
parente4e34855e658b78ecac50a651cc847662ff02cfd (diff)
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190927' into staging
target-arm queue: * Fix the CBAR register implementation for Cortex-A53, Cortex-A57, Cortex-A72 * Fix direct booting of Linux kernels on emulated CPUs which have an AArch32 EL3 (incorrect NSACR settings meant they could not access the FPU) * semihosting cleanup: do more work at translate time and less work at runtime # gpg: Signature made Fri 27 Sep 2019 15:32:43 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-20190927: hw/arm/boot: Use the IEC binary prefix definitions hw/arm/boot.c: Set NSACR.{CP11,CP10} for NS kernel boots tests/tcg: add linux-user semihosting smoke test for ARM target/arm: remove run-time semihosting checks for linux-user target/arm: remove run time semihosting checks target/arm: handle A-profile semihosting at translate time target/arm: handle M-profile semihosting at translate time tests/tcg: clean-up some comments after the de-tangling target/arm: fix CBAR register for AArch64 CPUs Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # tests/tcg/arm/Makefile.target
Diffstat (limited to 'tests/qapi-schema/alternate-conflict-dict.err')
0 files changed, 0 insertions, 0 deletions