[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Expres
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig |
Date: |
Thu, 25 Apr 2019 17:53:26 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 |
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined by looking at hw/arm/virt.c
>
> Signed-off-by: Thomas Huth <address@hidden>
> ---
> 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-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 abeaa54d88..4d0febf644 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -1,6 +1,24 @@
> config ARM_VIRT
> bool
> + imply PCI_DEVICES
Without -nodefaults I get:
qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
This is expected.
> + imply TEST_DEVICES
> + imply VFIO_AMD_XGBE
> imply VFIO_PLATFORM
> + imply VFIO_XGMAC
> + select A15MPCORE
> + select ACPI
> + select ARM_SMMUV3
You forgot to remove ARM_SMMUV3 from default-configs/aarch64-softmmu.mak.
With it removed:
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> + 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
> @@ -298,6 +316,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
>
- Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig, (continued)
[Qemu-arm] [PATCH for-QEMU-4.1 v5 17/29] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig, Thomas Huth, 2019/04/18
[Qemu-arm] [PATCH for-QEMU-4.1 v5 18/29] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig, Thomas Huth, 2019/04/18
[Qemu-arm] [PATCH for-QEMU-4.1 v5 19/29] hw/arm: Express dependencies of the MPS2 boards with Kconfig, Thomas Huth, 2019/04/18