From 32690c8bed5762518272876dcb6dd39a54f54fd1 Mon Sep 17 00:00:00 2001 From: Yang Zhong Date: Wed, 23 Jan 2019 14:56:13 +0800 Subject: display: express dependencies with kconfig Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-40-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - hw/display/Kconfig | 7 ++++++- hw/i2c/Kconfig | 1 + 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 -- cgit v1.2.3