diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2013-03-05 15:11:30 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-03-05 15:11:30 +0100 |
| commit | 76c48503c4c87afabf0c93acf78480f65276844d (patch) | |
| tree | 5da0770ccc0027de96f5671db62db5ac065a15b1 /hw/arm | |
| parent | 597e2cec8096e0703506abcbbf66938b5ac04368 (diff) | |
| parent | ed4659d10fa2ec16ace367e4fffe6f7ced73112c (diff) | |
| download | focaccia-qemu-76c48503c4c87afabf0c93acf78480f65276844d.tar.gz focaccia-qemu-76c48503c4c87afabf0c93acf78480f65276844d.zip | |
Merge branch 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm
* 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm: MAINTAINERS: add entry for ARM KVM guest cores configure: Enable KVM on ARM hw/kvm/arm_gic: Implement support for KVM in-kernel ARM GIC target-arm: Use MemoryListener to identify GIC base address for KVM hw/arm_gic: Convert ARM GIC classes to use init/realize hw/arm_gic: Add presave/postload hooks ARM KVM: save and load VFP registers from kernel ARM: KVM: Add support for KVM on ARM architecture target-arm: Drop CPUARMState* argument from bank_number() linux-headers: resync from mainline to add ARM KVM headers oslib-posix: Align to permit transparent hugepages on ARM Linux target-arm: Don't decode RFE or SRS on M profile cores target-arm: Factor out handling of SRS instruction
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 4c109858fd..0e7df6098a 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -32,5 +32,6 @@ obj-y += collie.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o obj-y += kzm.o obj-$(CONFIG_FDT) += ../device_tree.o +obj-$(CONFIG_KVM) += kvm/arm_gic.o obj-y := $(addprefix ../,$(obj-y)) |