Received: from eggs.gnu.org ([209.51.188.92]:46416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBNt-0004Di-SO for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBNs-0002cf-Qj for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:41 -0400 From: Thomas Huth Date: Thu, 18 Apr 2019 20:00:44 +0200 Message-Id: <20190418180057.3593-17-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Cc: Beniamino Galvani , Jan Kiszka , Antony Pavlov , Peter Chubb , qemu-block@nongnu.org, Cedric Le Goater , "Michael S. Tsirkin" , Andrew Jeffery , Igor Mitsyanko , Andrey Smirnov , Rob Herring , qemu-arm@nongnu.org, Andrzej Zaborowski , John Snow , Joel Stanley , "Edgar E . Iglesias" , Jean-Christophe Dubois , Marcel Apfelbaum , Philippe Mathieu-Daude , Alistair Francis , Subbaraya Sundeep , Gerd Hoffmann Dependencies have been determined by looking at hw/arm/virt.c Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 2580584281..f440a2b1cd 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=3Dy # CONFIG_PCI_DEVICES=3Dn # CONFIG_TEST_DEVICES=3Dn =20 +CONFIG_ARM_VIRT=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -32,8 +33,6 @@ CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy -CONFIG_PLATFORM_BUS=3Dy -CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_NETDUINO2=3Dy =20 @@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=3Dy CONFIG_ARMSSE_CPUID=3Dy CONFIG_ARMSSE_MHU=3Dy =20 -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy - CONFIG_ALLWINNER_A10_PIT=3Dy CONFIG_ALLWINNER_A10_PIC=3Dy CONFIG_ALLWINNER_A10=3Dy @@ -86,10 +82,5 @@ CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy -CONFIG_ACPI=3Dy -CONFIG_ARM_VIRT=3Dy -CONFIG_SMBIOS=3Dy -CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy -CONFIG_FW_CFG_DMA=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index abeaa54d88..4d0febf644 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 =20 config CHEETAH bool @@ -298,6 +316,7 @@ config A9MPCORE =20 config A15MPCORE bool + select ARM_GIC =20 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 +=3D boot.o sysbus-fdt.o +obj-y +=3D boot.o +obj-$(CONFIG_PLATFORM_BUS) +=3D sysbus-fdt.o obj-$(CONFIG_ARM_VIRT) +=3D virt.o obj-$(CONFIG_ACPI) +=3D virt-acpi-build.o obj-$(CONFIG_DIGIC) +=3D digic_boards.o --=20 2.21.0