aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Zhong <yang.zhong@intel.com>2019-01-23 14:56:13 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-07 21:45:53 +0100
commit32690c8bed5762518272876dcb6dd39a54f54fd1 (patch)
tree7bbcf4542b62ac4fb2c9483db560d352068f60d5
parent9533dcdd416530a0d72140c122bf90517b6c81eb (diff)
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>
-rw-r--r--default-configs/ppc-softmmu.mak1
-rw-r--r--default-configs/sh4-softmmu.mak1
-rw-r--r--default-configs/sh4eb-softmmu.mak1
-rw-r--r--hw/display/Kconfig7
-rw-r--r--hw/i2c/Kconfig1
5 files changed, 7 insertions, 4 deletions
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 0dcd863e80..d1ee6f7da8 100644
--- 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 7172c8bdc9..ccefc10670 100644
--- 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 3622afc650..c8edeb77d7 100644
--- 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 5393116ed4..999bc7e9a8 100644
--- 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 74c9328729..ef1caa6d89 100644
--- 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