[Minios-devel] [UNIKRAFT PATCHv4 43/43] plat/kvm: Add Arm64 support source code to build list

[Wei Chen <Wei.Chen@xxxxxxx>]

Currently, platform kvm only supports to build x86_64 source
code. We update the Makefile to support build Arm64 source
code.

Signed-off-by: Wei Chen <Wei.Chen@xxxxxxx>
---
 arch/arm/Compiler.uk |  4 ++++
 arch/arm/Makefile.uk |  4 ++++
 plat/kvm/Makefile.uk | 28 +++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/arch/arm/Compiler.uk b/arch/arm/Compiler.uk
index 147f662..3fd0f3f 100644
--- a/arch/arm/Compiler.uk
+++ b/arch/arm/Compiler.uk
@@ -1,3 +1,7 @@
 ifeq ($(CONFIG_UK_ARCH),arm)
        include $(CONFIG_UK_BASE)/arch/arm/arm/Compiler.uk
 endif
+
+ifeq ($(CONFIG_UK_ARCH),arm64)
+       include $(CONFIG_UK_BASE)/arch/arm/arm64/Compiler.uk
+endif
diff --git a/arch/arm/Makefile.uk b/arch/arm/Makefile.uk
index e59b2a3..11d81fb 100644
--- a/arch/arm/Makefile.uk
+++ b/arch/arm/Makefile.uk
@@ -2,3 +2,7 @@
 ifeq ($(CONFIG_UK_ARCH),arm)
        include $(CONFIG_UK_BASE)/arch/arm/arm/Makefile.uk
 endif
+
+ifeq ($(CONFIG_UK_ARCH),arm64)
+       include $(CONFIG_UK_BASE)/arch/arm/arm64/Makefile.uk
+endif
diff --git a/plat/kvm/Makefile.uk b/plat/kvm/Makefile.uk
index 9bedb37..2062c35 100644
--- a/plat/kvm/Makefile.uk
+++ b/plat/kvm/Makefile.uk
@@ -14,9 +14,11 @@ $(eval $(call addplatlib_s,kvm,libkvmpci,$(CONFIG_KVM_PCI)))
 ##
 LIBKVMPLAT_ASINCLUDES-y        += -I$(LIBKVMPLAT_BASE)/include
 LIBKVMPLAT_ASINCLUDES-y        += -I$(UK_PLAT_COMMON_BASE)/include
-LIBKVMPCI_ASINCLUDES-$(CONFIG_ARCH_X86_64)  += 
-I$(UK_PLAT_COMMON_BASE)/include/pci
 LIBKVMPLAT_CINCLUDES-y         += -I$(LIBKVMPLAT_BASE)/include
 LIBKVMPLAT_CINCLUDES-y         += -I$(UK_PLAT_COMMON_BASE)/include
+
+ifeq ($(CONFIG_ARCH_X86_64),y)
+LIBKVMPCI_ASINCLUDES-$(CONFIG_ARCH_X86_64)  += 
-I$(UK_PLAT_COMMON_BASE)/include/pci
 LIBKVMPCI_CINCLUDES-$(CONFIG_ARCH_X86_64)   += 
-I$(UK_PLAT_COMMON_BASE)/include/pci
 
 LIBKVMPLAT_SRCS-$(CONFIG_ARCH_X86_64) += 
$(UK_PLAT_COMMON_BASE)/x86/trace.c|common
@@ -34,12 +36,28 @@ LIBKVMPLAT_SRCS-$(CONFIG_ARCH_X86_64) += 
$(LIBKVMPLAT_BASE)/x86/setup.c
 LIBKVMPLAT_SRCS-$(CONFIG_ARCH_X86_64) += $(LIBKVMPLAT_BASE)/x86/console.c
 LIBKVMPLAT_SRCS-$(CONFIG_ARCH_X86_64) += $(LIBKVMPLAT_BASE)/x86/lcpu.c
 LIBKVMPLAT_SRCS-$(CONFIG_ARCH_X86_64) += $(LIBKVMPLAT_BASE)/x86/intctrl.c
+
+LIBKVMPCI_SRCS-$(CONFIG_ARCH_X86_64)  += 
$(UK_PLAT_COMMON_BASE)/pci_bus.c|common
+endif
+
+ifeq ($(CONFIG_ARCH_ARM_64),y)
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/arm/cpu_native.c|common
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/arm/psci_arm64.S|common
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/arm/traps.c|common
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/entry64.S
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/exceptions.S
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/pagetable.S
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/setup.c
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/console.c
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/lcpu.c
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/time.c
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/intctrl.c
+endif
+
 LIBKVMPLAT_SRCS-y              += $(LIBKVMPLAT_BASE)/shutdown.c
 LIBKVMPLAT_SRCS-y              += $(LIBKVMPLAT_BASE)/memory.c
 LIBKVMPLAT_SRCS-y              += $(LIBKVMPLAT_BASE)/irq.c
-LIBKVMPLAT_SRCS-y              += $(LIBKVMPLAT_BASE)/time.c
-LIBKVMPLAT_SRCS-y              += $(LIBKVMPLAT_BASE)/tscclock.c
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_X86_64)              += $(LIBKVMPLAT_BASE)/time.c
+LIBKVMPLAT_SRCS-$(CONFIG_ARCH_X86_64)              += 
$(LIBKVMPLAT_BASE)/tscclock.c
 LIBKVMPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/lcpu.c|common
 LIBKVMPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/memory.c|common
-
-LIBKVMPCI_SRCS-y                     += $(UK_PLAT_COMMON_BASE)/pci_bus.c|common
-- 
2.17.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel