From 36ad7c726f12e4b706eebc7bac185cd91646dbc3 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 11 Nov 2020 15:41:44 +0100 Subject: Upstream --- default-configs/devices/aarch64-rh-devices.mak | 1 - hw/arm/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/default-configs/devices/aarch64-rh-devices.mak b/default-configs/devices/aarch64-rh-devices.mak index 9831940..d289f34 100644 --- a/default-configs/devices/aarch64-rh-devices.mak +++ b/default-configs/devices/aarch64-rh-devices.mak @@ -1,7 +1,6 @@ include rh-virtio.mak CONFIG_ARM_GIC_KVM=y -CONFIG_ARM_GIC=y CONFIG_ARM_SMMUV3=y CONFIG_ARM_V7M=y CONFIG_ARM_VIRT=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7d022ee..e69a900 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -6,6 +6,7 @@ config ARM_VIRT imply VFIO_PLATFORM imply VFIO_XGMAC imply TPM_TIS_SYSBUS + select ARM_GIC select ACPI select ARM_SMMUV3 select GPIO_KEY -- 1.8.3.1