From: Yang Zhong <yang.zh...@intel.com> Use CONFIG_EDID to make edid-generate.c and edid-region.c configurable.
Signed-off-by: Yang Zhong <yang.zh...@intel.com> Reviewed-by: Thomas Huth <th...@redhat.com> Message-Id: <20190123065618.3520-26-yang.zh...@intel.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- default-configs/pci.mak | 1 + default-configs/virtio.mak | 1 + hw/display/Makefile.objs | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 037636f..0552190 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -49,3 +49,4 @@ CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) CONFIG_ROCKER=y CONFIG_VFIO=$(CONFIG_LINUX) CONFIG_VFIO_PCI=y +CONFIG_EDID=y diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index b653aa0..3abf68a 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -6,6 +6,7 @@ CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_CRYPTO=y CONFIG_VIRTIO_GPU=y +CONFIG_EDID=y CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_RNG=y diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 7c4ae9a..576fca4 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y += edid-generate.o +common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o @@ -15,12 +15,10 @@ common-obj-$(CONFIG_SSD0323) += ssd0323.o common-obj-$(CONFIG_XEN) += xenfb.o common-obj-$(CONFIG_VGA_PCI) += vga-pci.o -common-obj-$(CONFIG_VGA_PCI) += edid-region.o common-obj-$(CONFIG_VGA_ISA) += vga-isa.o common-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o common-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o -common-obj-$(CONFIG_BOCHS_DISPLAY) += edid-region.o common-obj-$(CONFIG_BLIZZARD) += blizzard.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o -- 1.8.3.1
