[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/28] hw/arm: Express dependencies of the virt machi
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 15/28] hw/arm: Express dependencies of the virt machine with Kconfig |
Date: |
Sun, 5 May 2019 15:57:01 +0200 |
Dependencies have been determined by looking at hw/arm/virt.c
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
default-configs/aarch64-softmmu.mak | 1 -
default-configs/arm-softmmu.mak | 11 +----------
hw/arm/Kconfig | 19 +++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/default-configs/aarch64-softmmu.mak
b/default-configs/aarch64-softmmu.mak
index 4ea9add003..313490fb38 100644
--- a/default-configs/aarch64-softmmu.mak
+++ b/default-configs/aarch64-softmmu.mak
@@ -9,4 +9,3 @@ CONFIG_DPCD=y
CONFIG_XLNX_ZYNQMP=y
CONFIG_XLNX_ZYNQMP_ARM=y
CONFIG_XLNX_VERSAL=y
-CONFIG_ARM_SMMUV3=y
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2580584281..f440a2b1cd 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
+CONFIG_ARM_VIRT=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
@@ -32,8 +33,6 @@ CONFIG_VGA=y
CONFIG_SSI_M25P80=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
-CONFIG_PLATFORM_BUS=y
-CONFIG_VIRTIO_MMIO=y
CONFIG_NETDUINO2=y
@@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=y
-CONFIG_PCI_EXPRESS=y
-CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-
CONFIG_ALLWINNER_A10_PIT=y
CONFIG_ALLWINNER_A10_PIC=y
CONFIG_ALLWINNER_A10=y
@@ -86,10 +82,5 @@ CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
-CONFIG_ACPI=y
-CONFIG_ARM_VIRT=y
-CONFIG_SMBIOS=y
-CONFIG_GPIO_KEY=y
CONFIG_MSF2=y
-CONFIG_FW_CFG_DMA=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 95ac0b540e..2b63adb667 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -1,6 +1,24 @@
config ARM_VIRT
bool
+ imply PCI_DEVICES
+ imply TEST_DEVICES
+ imply VFIO_AMD_XGBE
imply VFIO_PLATFORM
+ imply VFIO_XGMAC
+ select A15MPCORE
+ select ACPI
+ select ARM_SMMUV3
+ select GPIO_KEY
+ select FW_CFG_DMA
+ select PCI_EXPRESS
+ select PCI_EXPRESS_GENERIC_BRIDGE
+ select PFLASH_CFI01
+ select PL011 # UART
+ select PL031 # RTC
+ select PL061 # GPIO
+ select PLATFORM_BUS
+ select SMBIOS
+ select VIRTIO_MMIO
config CHEETAH
bool
@@ -299,6 +317,7 @@ config A9MPCORE
config A15MPCORE
bool
+ select ARM_GIC
config ARM11MPCORE
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 729e711b87..4f591ca487 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -1,4 +1,5 @@
-obj-y += boot.o sysbus-fdt.o
+obj-y += boot.o
+obj-$(CONFIG_PLATFORM_BUS) += sysbus-fdt.o
obj-$(CONFIG_ARM_VIRT) += virt.o
obj-$(CONFIG_ACPI) += virt-acpi-build.o
obj-$(CONFIG_DIGIC) += digic_boards.o
--
2.21.0
- [Qemu-devel] [PULL 05/28] hw/arm: Express dependencies of integratorcp with Kconfig, (continued)
- [Qemu-devel] [PULL 05/28] hw/arm: Express dependencies of integratorcp with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 07/28] hw/arm: Express dependencies of musicpal with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 06/28] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 09/28] hw/arm: Express dependencies of stellaris with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 08/28] hw/arm: Express dependencies of the OMAP machines with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 10/28] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 12/28] hw/arm: Express dependencies of xilinx-zynq with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 11/28] hw/arm: Express dependencies of the PXA2xx machines with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 14/28] hw/arm: Express dependencies of the aspeed boards with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 13/28] hw/arm: Express dependencies of collie with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 15/28] hw/arm: Express dependencies of the virt machine with Kconfig,
Thomas Huth <=
- [Qemu-devel] [PULL 16/28] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 17/28] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 19/28] hw/arm: Express dependencies of the raspi machines with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 20/28] hw/arm: Express dependencies of canon-a1100 with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 18/28] hw/arm: Express dependencies of the MPS2 boards with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 21/28] hw/arm: Express dependencies of sabrelite with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 23/28] hw/arm: Express dependencies of the remaining IMX boards with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 25/28] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 26/28] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 22/28] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig, Thomas Huth, 2019/05/05