Remove !NEW_VGIC dependency from GICV3 config and add new GICv3 files to the build system.
Signed-off-by: Mykyta Poturai <[email protected]> --- xen/arch/arm/Kconfig | 1 - xen/arch/arm/vgic/Makefile | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 2939db429b..c91011bc15 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -82,7 +82,6 @@ config ARM_EFI config GICV3 bool "GICv3 driver" - depends on !NEW_VGIC default n if ARM_32 default y if ARM_64 ---help--- diff --git a/xen/arch/arm/vgic/Makefile b/xen/arch/arm/vgic/Makefile index 806826948e..21a71d2502 100644 --- a/xen/arch/arm/vgic/Makefile +++ b/xen/arch/arm/vgic/Makefile @@ -1,5 +1,7 @@ obj-y += vgic.o obj-y += vgic-v2.o +obj-$(CONFIG_GICV3) += vgic-v3.o obj-y += vgic-mmio.o obj-y += vgic-mmio-v2.o +obj-$(CONFIG_GICV3) += vgic-mmio-v3.o obj-y += vgic-init.o -- 2.34.1
