Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6211753f authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: KVM: Build system integration 



Only the Makefile is plugged in. The Kconfig stuff is in a separate
patch to allow for an easier merge process.

Reviewed-by: default avatarChristopher Covington <cov@codeaurora.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent dcd2e40c

arch/arm64/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ TEXT_OFFSET := 0x00080000 
export	TEXT_OFFSET GZFLAGS

export	TEXT_OFFSET GZFLAGS





core-y		+= arch/arm64/kernel/ arch/arm64/mm/

core-y		+= arch/arm64/kernel/ arch/arm64/mm/

core-$(CONFIG_KVM) += arch/arm64/kvm/

libs-y		:= arch/arm64/lib/ $(libs-y)

libs-y		:= arch/arm64/lib/ $(libs-y)

libs-y		+= $(LIBGCC)

libs-y		+= $(LIBGCC)

arch/arm64/kvm/Makefile

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
#

# Makefile for Kernel-based Virtual Machine module

#



ccflags-y += -Ivirt/kvm -Iarch/arm64/kvm

CFLAGS_arm.o := -I.

CFLAGS_mmu.o := -I.



KVM=../../../virt/kvm

ARM=../../../arch/arm/kvm



obj-$(CONFIG_KVM_ARM_HOST) += kvm.o



kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/arm.o $(ARM)/mmu.o $(ARM)/mmio.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o



kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o

kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o

kvm-$(CONFIG_KVM_ARM_HOST) += guest.o reset.o sys_regs.o sys_regs_generic_v8.o



kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o

kvm-$(CONFIG_KVM_ARM_TIMER) += $(KVM)/arm/arch_timer.o