display: express dependencies with kconfig

Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190123065618.3520-40-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 0dcd863e80557f2fe7903f6b87b8445c7d41af04..d1ee6f7da83b0255595bf8ec671f7d59ca520d81 100644 (file)
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -29,7 +29,6 @@ CONFIG_PCI_EXPRESS=y
 CONFIG_SAM460EX=y
 CONFIG_USB_EHCI_SYSBUS=y
 CONFIG_SM501=y
-CONFIG_DDC=y
 CONFIG_IDE_SII3112=y
 CONFIG_AT24C=y
 CONFIG_BITBANG_I2C=y

diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 7172c8bdc9ad1af595f49719c09ddeba49335248..ccefc1067072aa31215082cae071c42c420dc99b 100644 (file)
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -8,7 +8,6 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_SH4=y
 CONFIG_IDE_MMIO=y
 CONFIG_SM501=y
-CONFIG_DDC=y
 CONFIG_TEST_DEVICES=y
 CONFIG_I82378=y
 CONFIG_I8259=y

diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 3622afc650da05e6f3df51f91d553d58bbbf84f8..c8edeb77d7b36d4cb1544f6bfa2270f850b52267 100644 (file)
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -8,7 +8,6 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_SH4=y
 CONFIG_IDE_MMIO=y
 CONFIG_SM501=y
-CONFIG_DDC=y
 CONFIG_TEST_DEVICES=y
 CONFIG_I82378=y
 CONFIG_I8259=y

diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index 5393116ed4cd83589b3862a44a0e687902abcd41..999bc7e9a8b68845964be9eabb8081a4fdda14f1 100644 (file)
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -38,6 +38,7 @@ config VGA_PCI
     default y if PCI_DEVICES
     depends on PCI
     select VGA
+    select EDID
 
 config VGA_ISA
     bool
@@ -59,6 +60,7 @@ config BOCHS_DISPLAY
     default y if PCI_DEVICES
     depends on PCI
     select VGA
+    select EDID
 
 config BLIZZARD
     bool
@@ -69,11 +71,13 @@ config FRAMEBUFFER
 config MILKYMIST_TMU2
     bool
     default y
-    depends on OPENGL && X11
+    depends on OPENGL && X11 && MILKYMIST
 
 config SM501
     bool
     select I2C
+    select DDC
+    select SERIAL
 
 config TCX
     bool
@@ -91,6 +95,7 @@ config QXL
 
 config VIRTIO_GPU
     bool
+    select EDID
 
 config VIRTIO_VGA
     bool

diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig
index 74c9328729075435ff5caceae0d8237ba5045d59..ef1caa6d89bb73fcf7e4076c068f120044c85917 100644 (file)
--- a/hw/i2c/Kconfig
+++ b/hw/i2c/Kconfig
@@ -8,6 +8,7 @@ config SMBUS_EEPROM
 config DDC
     bool
     depends on I2C
+    select EDID
 
 config VERSATILE_I2C
     bool