ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm: Express dependencies of the virt machine with Kconfig 

Dependencies have been determined by looking at hw/arm/virt.c

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2019-02-08 07:17:55 +01:00
parent 68e44ddade
commit 7951c7b7c0
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
default-configs/aarch64-softmmu.mak
View File

@ -9,4 +9,3 @@ CONFIG_DPCD=y
CONFIG_XLNX_ZYNQMP=y CONFIG_XLNX_ZYNQMP=y
CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_ZYNQMP_ARM=y
CONFIG_XLNX_VERSAL=y CONFIG_XLNX_VERSAL=y
CONFIG_ARM_SMMUV3=y

11
default-configs/arm-softmmu.mak
View File

@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
# CONFIG_PCI_DEVICES=n # CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n # CONFIG_TEST_DEVICES=n
CONFIG_ARM_VIRT=y
CONFIG_EXYNOS4=y CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y CONFIG_INTEGRATOR=y
@ -32,8 +33,6 @@ CONFIG_VGA=y
CONFIG_SSI_M25P80=y CONFIG_SSI_M25P80=y
CONFIG_ALLWINNER_EMAC=y CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y CONFIG_IMX_FEC=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
CONFIG_NETDUINO2=y CONFIG_NETDUINO2=y
@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=y CONFIG_ARMSSE_MHU=y
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
CONFIG_ALLWINNER_A10_PIT=y CONFIG_ALLWINNER_A10_PIT=y
CONFIG_ALLWINNER_A10_PIC=y CONFIG_ALLWINNER_A10_PIC=y
CONFIG_ALLWINNER_A10=y CONFIG_ALLWINNER_A10=y
@ -86,10 +82,5 @@ CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y CONFIG_XIO3130=y
CONFIG_IOH3420=y CONFIG_IOH3420=y
CONFIG_I82801B11=y CONFIG_I82801B11=y
CONFIG_ACPI=y
CONFIG_ARM_VIRT=y
CONFIG_SMBIOS=y
CONFIG_GPIO_KEY=y
CONFIG_MSF2=y CONFIG_MSF2=y
CONFIG_FW_CFG_DMA=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_PCI_EXPRESS_DESIGNWARE=y

19
hw/arm/Kconfig
View File

@ -1,6 +1,24 @@
config ARM_VIRT config ARM_VIRT
bool bool
imply PCI_DEVICES
imply TEST_DEVICES
imply VFIO_AMD_XGBE
imply VFIO_PLATFORM 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 config CHEETAH
bool bool
@ -299,6 +317,7 @@ config A9MPCORE
config A15MPCORE config A15MPCORE
bool bool
select ARM_GIC
config ARM11MPCORE config ARM11MPCORE
bool bool

3
hw/arm/Makefile.objs
View File

@ -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_ARM_VIRT) += virt.o
obj-$(CONFIG_ACPI) += virt-acpi-build.o obj-$(CONFIG_ACPI) += virt-acpi-build.o
obj-$(CONFIG_DIGIC) += digic_boards.o obj-$(CONFIG_DIGIC) += digic_boards.o