[UNIKRAFT PATCH RFCv2 05/27] build: Enable the platform bus and virtio_mmio device on arm64

[Jia He <justin.he@xxxxxxx>]

Enable the config for KVM_PF and add virtio mmio to the build system.

Signed-off-by: Jia He <justin.he@xxxxxxx>
---
 plat/kvm/Config.uk   | 12 ++++++++++--
 plat/kvm/Makefile.uk | 12 ++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/plat/kvm/Config.uk b/plat/kvm/Config.uk
index 3372b6c..9540feb 100644
--- a/plat/kvm/Config.uk
+++ b/plat/kvm/Config.uk
@@ -73,10 +73,18 @@ config KVM_PCI
        help
                 PCI bus driver for probing and operating PCI devices
 
+config KVM_PF
+       bool "Platform Bus Driver"
+       default y
+       depends on (ARCH_ARM_64)
+       select LIBUKBUS
+       help
+               Platform bus driver for probing and operating platform devices
+
 config VIRTIO_BUS
       bool  "Virtio bus driver"
       default y
-      depends on (ARCH_X86_64)
+      depends on (ARCH_X86_64 || ARCH_ARM_64)
       depends on LIBUKBUS
       select LIBUKALLOC
       select LIBUKSGLIST
@@ -100,7 +108,7 @@ config VIRTIO_NET
        default n
        depends on LIBUKNETDEV
        imply VIRTIO_PCI if ARCH_X86_64
-       select VIRTIO_BUS
+       select VIRTIO
        select LIBUKSGLIST
        help
               Virtual network driver.
diff --git a/plat/kvm/Makefile.uk b/plat/kvm/Makefile.uk
index 94321e0..7b12b1a 100644
--- a/plat/kvm/Makefile.uk
+++ b/plat/kvm/Makefile.uk
@@ -8,6 +8,7 @@ $(eval $(call addplat_s,kvm,$(CONFIG_PLAT_KVM)))
 ##
 $(eval $(call addplatlib,kvm,libkvmplat))
 $(eval $(call addplatlib_s,kvm,libkvmpci,$(CONFIG_KVM_PCI)))
+$(eval $(call addplatlib_s,kvm,libkvmpf,$(CONFIG_KVM_PF)))
 $(eval $(call addplatlib_s,kvm,libkvmvirtio,$(CONFIG_VIRTIO_BUS)))
 $(eval $(call addplatlib_s,kvm,libkvmvirtionet,$(CONFIG_VIRTIO_NET)))
 $(eval $(call addplatlib_s,kvm,libkvmvirtioblk,$(CONFIG_VIRTIO_BLK)))
@@ -114,6 +115,15 @@ LIBKVMPCI_CINCLUDES-$(CONFIG_ARCH_X86_64)   += 
-I$(LIBKVMPLAT_BASE)/include
 LIBKVMPCI_CINCLUDES-$(CONFIG_ARCH_X86_64)   += -I$(UK_PLAT_COMMON_BASE)/include
 LIBKVMPCI_SRCS-$(CONFIG_ARCH_X86_64)        += 
$(UK_PLAT_COMMON_BASE)/pci_bus.c|common
 
+##
+## Platform bus library definitions
+##
+LIBKVMPF_ASINCLUDES-$(CONFIG_ARCH_ARM_64)  += -I$(UK_PLAT_COMMON_BASE)/include
+LIBKVMPF_CINCLUDES-$(CONFIG_ARCH_ARM_64)   += -I$(UK_PLAT_COMMON_BASE)/include
+LIBKVMPF_CINCLUDES-$(CONFIG_ARCH_ARM_64)   += -I$(LIBKVMPLAT_BASE)/include
+LIBKVMPF_CINCLUDES-$(CONFIG_ARCH_ARM_64)   += -I$(UK_PLAT_DRIVERS_BASE)/include
+LIBKVMPF_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/platform_bus.c|common
+
 ##
 ## Virtio library definitions
 ##
@@ -129,6 +139,8 @@ LIBKVMVIRTIO_SRCS-$(CONFIG_VIRTIO_BUS) +=\
                        $(UK_PLAT_DRIVERS_BASE)/virtio/virtio_ring.c
 LIBKVMVIRTIO_SRCS-$(CONFIG_VIRTIO_PCI) +=\
                        $(UK_PLAT_DRIVERS_BASE)/virtio/virtio_pci.c
+LIBKVMVIRTIO_SRCS-$(CONFIG_ARCH_ARM_64)        +=\
+                       $(UK_PLAT_DRIVERS_BASE)/virtio/virtio_mmio.c
 ##
 ## Virtio Net library definition
 ##
-- 
2.17.1