diff mbox

[PULL,00/17] target-arm queue

Message ID CAFEAcA_N+WVGOt0WDeVYZZL5ZXbYVZN_13pJrr2o6Knxh-cqpw@mail.gmail.com
State Not Applicable
Headers show

Commit Message

Peter Maydell March 30, 2016, 4:25 p.m. UTC 
On 30 March 2016 at 15:57, Peter Maydell <peter.maydell@linaro.org> wrote:
>

> Last lot of target-arm patches just sneaking under the wire:

>  * m25p80 (should be safe enough since not really used by anything)

>  * virt power key bugfix

>  * query-gic-capabilities QMP command

>

> thanks

> -- PMM

>

> The following changes since commit b9c27e7ae6fb1387eafe858d8378ff14cd1c5b89:

>

>   Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-03-30 13:43:05 +0100)

>

> are available in the git repository at:

>

>

>   git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20160330

>

> for you to fetch changes up to eefb90314f80c421899f8c42e59df7b80a27c93b:

>

>   arm: implement query-gic-capabilities (2016-03-30 15:48:27 +0100)

>

> ----------------------------------------------------------------

> target-arm queue:

>  * virt: fix the virtual power button by adding a modelled

>    "key press for 100ms" device

>  * various improvements to m25p80 flash devices

>  * implement new QMP query-gic-capability command to let the

>    management layer know what versions of GIC we support


Whoops, build failure for the linux-user targets. Fixup patch:


thanks
-- PMM
diff mbox

Patch

diff --git a/target-arm/Makefile.objs b/target-arm/Makefile.objs
index 334074c..82cbe6b 100644
--- a/target-arm/Makefile.objs
+++ b/target-arm/Makefile.objs
@@ -1,5 +1,5 @@ 
 obj-y += arm-semi.o
-obj-$(CONFIG_SOFTMMU) += machine.o psci.o arch_dump.o
+obj-$(CONFIG_SOFTMMU) += machine.o psci.o arch_dump.o monitor.o
 obj-$(CONFIG_KVM) += kvm.o
 obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o
 obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) += kvm64.o
@@ -8,4 +8,4 @@  obj-y += translate.o op_helper.o helper.o cpu.o
 obj-y += neon_helper.o iwmmxt_helper.o
 obj-y += gdbstub.o
 obj-$(TARGET_AARCH64) += cpu64.o translate-a64.o helper-a64.o gdbstub64.o
-obj-y += crypto_helper.o monitor.o
+obj-y += crypto_helper.o