Merge remote-tracking branch 'remotes/juanquintela/tags/pull-migration-pull-request...

[qemu.git] / hw / misc / Kconfig

diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 2433d1b4e458059a7996f57bee17a56c60cc588f..bdd77d80205907562b748fbe51584423f2e4b1c8 100644 (file)
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -34,7 +34,7 @@ config PCI_TESTDEV
 config EDU
     bool
     default y if TEST_DEVICES
-    depends on PCI
+    depends on PCI && MSI_NONBROKEN
 
 config PCA9552
     bool
@@ -57,22 +57,37 @@ config MOS6522
 
 config MACIO
     bool
+    select CUDA
+    select ESCC
+    select IDE_MACIO
+    select MAC_DBDMA
+    select MAC_NVRAM
+    select MOS6522
 
 config IVSHMEM_DEVICE
     bool
     default y if PCI_DEVICES
-    depends on PCI && LINUX && IVSHMEM
+    depends on PCI && LINUX && IVSHMEM && MSI_NONBROKEN
 
 config ECCMEMCTL
     bool
+    select ECC
 
 config IMX
     bool
     select PTIMER
+    select SSI
+    select USB_EHCI_SYSBUS
 
 config STM32F2XX_SYSCFG
     bool
 
+config STM32F4XX_SYSCFG
+    bool
+
+config STM32F4XX_EXTI
+    bool
+
 config MIPS_ITU
     bool
 
@@ -108,4 +123,12 @@ config AUX
     bool
     select I2C
 
+config UNIMP
+    bool
+
+config MAC_VIA
+    bool
+    select MOS6522
+    select ADB
+
 source macio/Kconfig